drm/amd/display: Move PSR support message into amdgpu_dm

[Why]
PSR support could vary from the panels connected to one GPU versus
another.

[How]
Move PSR support message into amdgpu_dm which has the scope of the
GPU and use that information.

Reviewed-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Roman Li <roman.li@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 b920760108d2c40aac4ed14b86acc898685a3af2..58e758732338ab06aec1f3a4c1066e3e0d4b1b58 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -5417,8 +5417,15 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
                                        if (amdgpu_dm_set_replay_caps(link, aconnector))
                                                psr_feature_enabled = false;
 
-                               if (psr_feature_enabled)
+                               if (psr_feature_enabled) {
                                        amdgpu_dm_set_psr_caps(link);
+                                       drm_info(adev_to_drm(adev), "PSR support %d, DC PSR ver %d, sink PSR ver %d DPCD caps 0x%x su_y_granularity %d\n",
+                                                link->psr_settings.psr_feature_enabled,
+                                                link->psr_settings.psr_version,
+                                                link->dpcd_caps.psr_info.psr_version,
+                                                link->dpcd_caps.psr_info.psr_dpcd_caps.raw,
+                                                link->dpcd_caps.psr_info.psr2_su_y_granularity_cap);
+                               }
                        }
                }
                amdgpu_set_panel_orientation(&aconnector->base);

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c
index e140b7a04d7246952d7b4512ad267113449bd642..f984cb0cb88976695451a51cc40c26e8d22017a7 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c
@@ -87,14 +87,6 @@ void amdgpu_dm_set_psr_caps(struct dc_link *link)
 
                link->psr_settings.psr_feature_enabled = true;
        }
-
-       DRM_INFO("PSR support %d, DC PSR ver %d, sink PSR ver %d DPCD caps 0x%x su_y_granularity %d\n",
-               link->psr_settings.psr_feature_enabled,
-               link->psr_settings.psr_version,
-               link->dpcd_caps.psr_info.psr_version,
-               link->dpcd_caps.psr_info.psr_dpcd_caps.raw,
-               link->dpcd_caps.psr_info.psr2_su_y_granularity_cap);
-
 }
 
 /*