drm/amd/display: explicitly disable psr_feature_enable appropriately

[ Upstream commit 6094b9136ca9038b61e9c4b5d25cd5512ce50b34 ]

[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+
Signed-off-by: Sasha Levin <sashal@kernel.org>

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 7072fb2ec07fae47b93aae0d8ef39e858cb5c186..278ff281a1bd578f6a5e152c6928288d0b9a79e0 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
@@ -36,10 +36,14 @@ void amdgpu_dm_set_psr_caps(struct dc_link *link)
 {
        uint8_t dpcd_data[EDP_PSR_RECEIVER_CAP_SIZE];
 
-       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 (dm_helpers_dp_read_dpcd(NULL, link, DP_PSR_SUPPORT,
                                        dpcd_data, sizeof(dpcd_data))) {
                link->dpcd_caps.psr_caps.psr_version = dpcd_data[0];