From: Sasha Levin Date: Wed, 1 Mar 2023 01:44:36 +0000 (-0500) Subject: Drop drm-amd-display-disable-s-g-display-on-dcn-3.1.2-3.patch X-Git-Tag: v4.19.275~10^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=342779fce5be0feecad3cca7380448c08b9217f2;p=thirdparty%2Fkernel%2Fstable-queue.git Drop drm-amd-display-disable-s-g-display-on-dcn-3.1.2-3.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.1/drm-amd-display-disable-s-g-display-on-dcn-3.1.2-3.patch b/queue-6.1/drm-amd-display-disable-s-g-display-on-dcn-3.1.2-3.patch deleted file mode 100644 index e0d0a30a780..00000000000 --- a/queue-6.1/drm-amd-display-disable-s-g-display-on-dcn-3.1.2-3.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4876a136930169aff0b0eed672d1a0ae08e2fbcf Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 25 Jan 2023 09:57:27 -0500 -Subject: drm/amd/display: disable S/G display on DCN 3.1.2/3 - -From: Alex Deucher - -[ Upstream commit 077e9659581acab70f2dcc04b5bc799aca3a056b ] - -Causes flickering or white screens in some configurations. -Disable it for now until we can fix the issue. - -Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2352 -Cc: roman.li@amd.com -Cc: yifan1.zhang@amd.com -Reviewed-by: Yifan Zhang -Signed-off-by: Alex Deucher -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 -- - 1 file changed, 2 deletions(-) - -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 e9c4f22696c5c..d39f77b960458 100644 ---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -@@ -1524,8 +1524,6 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) - break; - case IP_VERSION(2, 1, 0): - case IP_VERSION(3, 0, 1): -- case IP_VERSION(3, 1, 2): -- case IP_VERSION(3, 1, 3): - case IP_VERSION(3, 1, 6): - init_data.flags.gpu_vm_support = true; - break; --- -2.39.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 6a6069c1189..8ba6944634e 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -21,7 +21,6 @@ asoc-codecs-es8326-fix-dts-properties-reading.patch hid-ignore-battery-for-elan-touchscreen-29df-on-hp.patch selftests-ocelot-tc_flower_chains-make-test_vlan_ing.patch x86-cpu-add-lunar-lake-m.patch -drm-amd-display-disable-s-g-display-on-dcn-3.1.2-3.patch pm-sleep-avoid-using-pr_cont-in-the-tasks-freezing-code.patch bpf-bpf_fib_lookup-should-not-return-neigh-in-nud_failed-state.patch net-remove-warn_on_once-sk-sk_forward_alloc-from-sk_stream_kill_queues.patch