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

From Harry Wentland
78516979792d4bf890e1df24c7f425ebe920ad29 in linux-6.6.y/6.6.24
78aca9ee5e012e130dbfbd7191bc2302b0cf3b37 in mainline linux

diff --git a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index ff0e1ac..c62bbcd 100644 (file)
--- a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -6125,9 +6125,8 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
 
        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
@@ -6143,9 +6142,8 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
                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);
+               aconnector->psr_skip_count = AMDGPU_DM_PSR_ENTRY_DELAY;
 
-               if (stream->link->psr_settings.psr_feature_enabled)
-                       aconnector->psr_skip_count = AMDGPU_DM_PSR_ENTRY_DELAY;
        }
 finish:
        dc_sink_release(sink);

diff --git a/sys/dev/pci/drm/amd/display/modules/info_packet/info_packet.c b/sys/dev/pci/drm/amd/display/modules/info_packet/info_packet.c
index 738ee76..84f9b41 100644 (file)
--- a/sys/dev/pci/drm/amd/display/modules/info_packet/info_packet.c
+++ b/sys/dev/pci/drm/amd/display/modules/info_packet/info_packet.c
@@ -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->psr_settings.psr_version == DC_PSR_VERSION_1)
-                       vsc_packet_revision = vsc_packet_rev2;
-       }
-
-       if (stream->link->replay_settings.config.replay_supported)
+       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;
 
        /* Update to revision 5 for extended colorimetry support */
        if (stream->use_vsc_sdp_for_colorimetry)