git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 78aca9ee5e012e130dbfbd7191bc2302b0cf3b37 Mon Sep 17 00:00:00 2001
   2 From: Harry Wentland <harry.wentland@amd.com>
   3 Date: Tue, 12 Mar 2024 11:21:32 -0400
   4 Subject: Revert "drm/amd/display: Fix sending VSC (+ colorimetry) packets for DP/eDP displays without PSR"
   5
   6 From: Harry Wentland <harry.wentland@amd.com>
   7
   8 commit 78aca9ee5e012e130dbfbd7191bc2302b0cf3b37 upstream.
   9
  10 This causes flicker on a bunch of eDP panels. The info_packet code
  11 also caused regressions on other OSes that we haven't' seen on Linux
  12 yet, but that is likely due to the fact that we haven't had a chance
  13 to test those environments on Linux.
  14
  15 We'll need to revisit this.
  16
  17 This reverts commit 202260f64519e591b5cd99626e441b6559f571a3.
  18
  19 Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3207
  20 Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3151
  21 Signed-off-by: Harry Wentland <harry.wentland@amd.com>
  22 Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
  23 Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  24 Cc: stable@vger.kernel.org
  25 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  26 ---
  27  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c             |    8 ++----
  28  drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c |   13 +++-------
  29  2 files changed, 8 insertions(+), 13 deletions(-)
  30
  31 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
  32 +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
  33 @@ -6121,9 +6121,8 @@ create_stream_for_sink(struct amdgpu_dm_
  34
  35         if (stream->signal == SIGNAL_TYPE_HDMI_TYPE_A)
  36                 mod_build_hf_vsif_infopacket(stream, &stream->vsp_infopacket);
  37 -       else if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT ||
  38 -                        stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST ||
  39 -                        stream->signal == SIGNAL_TYPE_EDP) {
  40 +
  41 +       if (stream->link->psr_settings.psr_feature_enabled || stream->link->replay_settings.replay_feature_enabled) {
  42                 //
  43                 // should decide stream support vsc sdp colorimetry capability
  44                 // before building vsc info packet
  45 @@ -6139,9 +6138,8 @@ create_stream_for_sink(struct amdgpu_dm_
  46                 if (stream->out_transfer_func->tf == TRANSFER_FUNCTION_GAMMA22)
  47                         tf = TRANSFER_FUNC_GAMMA_22;
  48                 mod_build_vsc_infopacket(stream, &stream->vsc_infopacket, stream->output_color_space, tf);
  49 +               aconnector->psr_skip_count = AMDGPU_DM_PSR_ENTRY_DELAY;
  50
  51 -               if (stream->link->psr_settings.psr_feature_enabled)
  52 -                       aconnector->psr_skip_count = AMDGPU_DM_PSR_ENTRY_DELAY;
  53         }
  54  finish:
  55         dc_sink_release(sink);
  56 --- a/drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c
  57 +++ b/drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c
  58 @@ -147,15 +147,12 @@ void mod_build_vsc_infopacket(const stru
  59         }
  60
  61         /* VSC packet set to 4 for PSR-SU, or 2 for PSR1 */
  62 -       if (stream->link->psr_settings.psr_feature_enabled) {
  63 -               if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_SU_1)
  64 -                       vsc_packet_revision = vsc_packet_rev4;
  65 -               else if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_1)
  66 -                       vsc_packet_revision = vsc_packet_rev2;
  67 -       }
  68 -
  69 -       if (stream->link->replay_settings.config.replay_supported)
  70 +       if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_SU_1)
  71 +               vsc_packet_revision = vsc_packet_rev4;
  72 +       else if (stream->link->replay_settings.config.replay_supported)
  73                 vsc_packet_revision = vsc_packet_rev4;
  74 +       else if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_1)
  75 +               vsc_packet_revision = vsc_packet_rev2;
  76
  77         /* Update to revision 5 for extended colorimetry support */
  78         if (stream->use_vsc_sdp_for_colorimetry)