Commit 78aca9ee authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

Revert "drm/amd/display: Fix sending VSC (+ colorimetry) packets for DP/eDP displays without PSR" 

This causes flicker on a bunch of eDP panels. The info_packet code
also caused regressions on other OSes that we haven't' seen on Linux
yet, but that is likely due to the fact that we haven't had a chance
to test those environments on Linux.

We'll need to revisit this.

This reverts commit 202260f6.

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


Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 1210e2f1

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

+3 −5
Original line number Diff line number Diff line
@@ -6305,9 +6305,8 @@ create_stream_for_sink(struct drm_connector *connector, 


	if (stream->signal == SIGNAL_TYPE_HDMI_TYPE_A)

		mod_build_hf_vsif_infopacket(stream, &stream->vsp_infopacket);

	else if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT ||

			 stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST ||

			 stream->signal == SIGNAL_TYPE_EDP) {



	if (stream->link->psr_settings.psr_feature_enabled || stream->link->replay_settings.replay_feature_enabled) {

		//

		// should decide stream support vsc sdp colorimetry capability

		// before building vsc info packet
@@ -6323,9 +6322,8 @@ create_stream_for_sink(struct drm_connector *connector, 
		if (stream->out_transfer_func->tf == TRANSFER_FUNCTION_GAMMA22)

			tf = TRANSFER_FUNC_GAMMA_22;

		mod_build_vsc_infopacket(stream, &stream->vsc_infopacket, stream->output_color_space, tf);



		if (stream->link->psr_settings.psr_feature_enabled)

		aconnector->psr_skip_count = AMDGPU_DM_PSR_ENTRY_DELAY;



	}

finish:

	dc_sink_release(sink);

drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c

+5 −8
Original line number Diff line number Diff line
@@ -147,15 +147,12 @@ void mod_build_vsc_infopacket(const struct dc_stream_state *stream, 
	}



	/* VSC packet set to 4 for PSR-SU, or 2 for PSR1 */

	if (stream->link->psr_settings.psr_feature_enabled) {

	if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_SU_1)

		vsc_packet_revision = vsc_packet_rev4;

	else if (stream->link->replay_settings.config.replay_supported)

		vsc_packet_revision = vsc_packet_rev4;

	else if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_1)

		vsc_packet_revision = vsc_packet_rev2;

	}



	if (stream->link->replay_settings.config.replay_supported)

		vsc_packet_revision = vsc_packet_rev4;



	/* Update to revision 5 for extended colorimetry support */

	if (stream->use_vsc_sdp_for_colorimetry)