drm/amd/display: explicitly disable psr_feature_enable appropriately
authorShirish S <shirish.s@amd.com>
Fri, 7 Oct 2022 15:01:49 +0000 (20:31 +0530)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 10 Oct 2022 21:09:30 +0000 (17:09 -0400)
[Why]
If psr_feature_enable is set to true by default, it continues to be enabled
for non capable links.

[How]
explicitly disable the feature on links that are not capable of the same.

Fixes: 8c322309e48e9 ("drm/amd/display: Enable PSR")
Signed-off-by: Shirish S <shirish.s@amd.com>
Reviewed-by: Leo Li <sunpeng.li@amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 5.15+
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c

index 8ca10ab..26291db 100644 (file)
@@ -60,11 +60,15 @@ static bool link_supports_psrsu(struct dc_link *link)
  */
 void amdgpu_dm_set_psr_caps(struct dc_link *link)
 {
-       if (!(link->connector_signal & SIGNAL_TYPE_EDP))
+       if (!(link->connector_signal & SIGNAL_TYPE_EDP)) {
+               link->psr_settings.psr_feature_enabled = false;
                return;
+       }
 
-       if (link->type == dc_connection_none)
+       if (link->type == dc_connection_none) {
+               link->psr_settings.psr_feature_enabled = false;
                return;
+       }
 
        if (link->dpcd_caps.psr_info.psr_version == 0) {
                link->psr_settings.psr_version = DC_PSR_VERSION_UNSUPPORTED;