FAILED: patch "[PATCH] Revert "drm/amd/display: disable S/G display on DCN 3.1.4"" failed to apply to 6.1-stable tree

FAILED: patch "[PATCH] Revert "drm/amd/display: disable S/G display on DCN 3.1.4"" failed to apply to 6.1-stable tree

[gregkh]

The patch below does not apply to the 6.1-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 <stable@vger.kernel.org>.

Possible dependencies:

7ece674cd946 ("Revert "drm/amd/display: disable S/G display on DCN 3.1.4"")
077e9659581a ("drm/amd/display: disable S/G display on DCN 3.1.2/3")
a52287d66dfa ("drm/amd/display: disable S/G display on DCN 3.1.4")
e78cc6a4c748 ("drm/amd/display: disable S/G display on DCN 3.1.5")
fe6872adb05e ("drm/amd/display: Add DCN314 display SG Support")

thanks,

greg k-h

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

From 7ece674cd9468ce740494f6108c39831cfc7eb4e Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Tue, 31 Jan 2023 13:10:55 -0500
Subject: [PATCH] Revert "drm/amd/display: disable S/G display on DCN 3.1.4"

This reverts commit 9aa15370819294beb7eb67c9dcbf654d79ff8790.

This is fixed now so we can re-enable S/G display on DCN
3.1.4.

Reviewed-by: Yifan Zhang <yifan1.zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 6.1.x

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 7f6e27561899..78452856b2a3 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1514,6 +1514,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
 				init_data.flags.gpu_vm_support = true;
 			break;
 		case IP_VERSION(3, 0, 1):
+		case IP_VERSION(3, 1, 4):
 		case IP_VERSION(3, 1, 6):
 			init_data.flags.gpu_vm_support = true;
 			break;