Commit 05af8007 authored by Alex Hung's avatar Alex Hung Committed by Alex Deucher
Browse files

drm/amd/display: Add HDR workaround for specific eDP 

[WHY & HOW]
Some eDP panels suffer from flicking when HDR is enabled in KDE. This
quirk works around it by skipping VSC that is incompatible with eDP
panels.

Link: https://gitlab.freedesktop.org/drm/amd/-/issues/3151


Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarRodrigo Siqueira <rodrigo.siqueira@amd.com>
Signed-off-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 4d425728)
Cc: stable@vger.kernel.org
parent c36df0f5

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+10 −1
Original line number Diff line number Diff line
@@ -6735,12 +6735,21 @@ create_stream_for_sink(struct drm_connector *connector, 
	if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT ||

	    stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST ||

	    stream->signal == SIGNAL_TYPE_EDP) {

		const struct dc_edid_caps *edid_caps;

		unsigned int disable_colorimetry = 0;



		if (aconnector->dc_sink) {

			edid_caps = &aconnector->dc_sink->edid_caps;

			disable_colorimetry = edid_caps->panel_patch.disable_colorimetry;

		}



		//

		// should decide stream support vsc sdp colorimetry capability

		// before building vsc info packet

		//

		stream->use_vsc_sdp_for_colorimetry = stream->link->dpcd_caps.dpcd_rev.raw >= 0x14 &&

						      stream->link->dpcd_caps.dprx_feature.bits.VSC_SDP_COLORIMETRY_SUPPORTED;

						      stream->link->dpcd_caps.dprx_feature.bits.VSC_SDP_COLORIMETRY_SUPPORTED &&

						      !disable_colorimetry;



		if (stream->out_transfer_func.tf == TRANSFER_FUNCTION_GAMMA22)

			tf = TRANSFER_FUNC_GAMMA_22;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c

+4 −0
Original line number Diff line number Diff line
@@ -73,6 +73,10 @@ static void apply_edid_quirks(struct edid *edid, struct dc_edid_caps *edid_caps) 
		DRM_DEBUG_DRIVER("Clearing DPCD 0x317 on monitor with panel id %X\n", panel_id);

		edid_caps->panel_patch.remove_sink_ext_caps = true;

		break;

	case drm_edid_encode_panel_id('S', 'D', 'C', 0x4154):

		DRM_DEBUG_DRIVER("Disabling VSC on monitor with panel id %X\n", panel_id);

		edid_caps->panel_patch.disable_colorimetry = true;

		break;

	default:

		return;

	}

drivers/gpu/drm/amd/display/dc/dc_types.h

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ struct dc_panel_patch { 
	unsigned int skip_avmute;

	unsigned int mst_start_top_delay;

	unsigned int remove_sink_ext_caps;

	unsigned int disable_colorimetry;

};



struct dc_edid_caps {