Afaict there's no reason why it wasn't done before, and this is required
for later FreeSync 2 HDR enablement.

Signed-off-by: Xaver Hugl <[email protected]>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 163780030eb1..1660169ae5aa 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -9048,7 +9048,10 @@ static void update_freesync_state_on_stream(
 
        aconn = (struct amdgpu_dm_connector *)new_stream->dm_stream_context;
 
-       if (aconn && (aconn->as_type == FREESYNC_TYPE_PCON_IN_WHITELIST || 
aconn->vsdb_info.replay_mode)) {
+       if (aconn && (aconn->as_type == FREESYNC_TYPE_PCON_IN_WHITELIST ||
+                    (aconn->as_type == ADAPTIVE_SYNC_TYPE_DP &&
+                       aconn->vsdb_info.amd_vsdb_version != 0) ||
+                     aconn->vsdb_info.replay_mode)) {
                pack_sdp_v1_3 = aconn->pack_sdp_v1_3;
 
                if (aconn->vsdb_info.amd_vsdb_version == 1)
@@ -9058,8 +9061,9 @@ static void update_freesync_state_on_stream(
                else if (aconn->vsdb_info.amd_vsdb_version == 3)
                        packet_type = PACKET_TYPE_FS_V3;
 
-               mod_build_adaptive_sync_infopacket(new_stream, aconn->as_type, 
NULL,
-                                       &new_stream->adaptive_sync_infopacket);
+               if (aconn->as_type != ADAPTIVE_SYNC_TYPE_DP)
+                       mod_build_adaptive_sync_infopacket(new_stream, 
aconn->as_type, NULL,
+                                                          
&new_stream->adaptive_sync_infopacket);
        }
 
        mod_freesync_build_vrr_infopacket(
-- 
2.51.1

Reply via email to