FAILED: patch "[PATCH] drm/amd/display: explicitly disable psr_feature_enable" failed to apply to 5.15-stable tree

The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Possible dependencies:

6094b9136ca9 ("drm/amd/display: explicitly disable psr_feature_enable appropriately") cd9a0d026baa ("drm/amd/display: parse and check PSR SU caps")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 6094b9136ca9038b61e9c4b5d25cd5512ce50b34 Mon Sep 17 00:00:00 2001
From: Shirish S <[email protected]>
Date: Fri, 7 Oct 2022 20:31:49 +0530
Subject: [PATCH] drm/amd/display: explicitly disable psr_feature_enable
appropriately

[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.

index 8ca10ab3dfc1..26291db0a3cf 100644
@@ -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;