Commit 3f0b5af1 authored by Agustin Gutierrez's avatar Agustin Gutierrez Committed by Alex Deucher
Browse files

drm/amd/display: Fix DSC-re-computing



[Why]
This fixes a bug introduced by commit c5365554 ("drm/amd/display: dsc
mst re-compute pbn for changes on hub").
The change caused light-up issues with a second display that required
DSC on some MST docks.

[How]
Use Virtual DPCD for DSC caps in MST case.

[Limitations]
This change only affects MST DSC devices that follow specifications
additional changes are required to check for old MST DSC devices such as
ones which do not check for Virtual DPCD registers.

Reviewed-by: default avatarSwapnil Patel <swapnil.patel@amd.com>
Reviewed-by: default avatarHersen Wu <hersenxs.wu@amd.com>
Acked-by: default avatarTom Chung <chiahsuan.chung@amd.com>
Signed-off-by: default avatarAgustin Gutierrez <agustin.gutierrez@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 284f141f
Loading
Loading
Loading
Loading
+13 −5
Original line number Diff line number Diff line
@@ -1219,10 +1219,6 @@ static bool is_dsc_need_re_compute(
	if (dc_link->type != dc_connection_mst_branch)
		return false;

	if (!(dc_link->dpcd_caps.dsc_caps.dsc_basic_caps.fields.dsc_support.DSC_SUPPORT ||
		dc_link->dpcd_caps.dsc_caps.dsc_basic_caps.fields.dsc_support.DSC_PASSTHROUGH_SUPPORT))
		return false;

	for (i = 0; i < MAX_PIPES; i++)
		stream_on_link[i] = NULL;

@@ -1240,7 +1236,19 @@ static bool is_dsc_need_re_compute(
			continue;

		aconnector = (struct amdgpu_dm_connector *) stream->dm_stream_context;
		if (!aconnector)
		if (!aconnector || !aconnector->dsc_aux)
			continue;

		/*
		 *	Check if cached virtual MST DSC caps are available and DSC is supported
		 *	this change takes care of newer MST DSC capable devices that report their
		 *	DPCD caps as per specifications in their Virtual DPCD registers.

		 *	TODO: implement the check for older MST DSC devices that do not conform to
		 *	specifications.
		*/
		if (!(aconnector->dc_sink->dsc_caps.dsc_dec_caps.is_dsc_supported ||
			aconnector->dc_link->dpcd_caps.dsc_caps.dsc_basic_caps.fields.dsc_support.DSC_PASSTHROUGH_SUPPORT))
			continue;

		stream_on_link[new_stream_on_link_num] = aconnector;