From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 5 Oct 2022 10:47:16 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v5.4.217~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b7c6179fcd3393e2ceefb0777c499a020378de6e;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	revert-drm-amdgpu-use-dirty-framebuffer-helper.patch
---

diff --git a/queue-5.4/revert-drm-amdgpu-use-dirty-framebuffer-helper.patch b/queue-5.4/revert-drm-amdgpu-use-dirty-framebuffer-helper.patch
new file mode 100644
index 00000000000..17fa5743d38
--- /dev/null
+++ b/queue-5.4/revert-drm-amdgpu-use-dirty-framebuffer-helper.patch
@@ -0,0 +1,42 @@
+From 68683a9c40c7a7231db247fb5f160022ec68b06e Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Wed, 5 Oct 2022 12:36:45 +0200
+Subject: Revert "drm/amdgpu: use dirty framebuffer helper"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit c89849ecfd2e10838b31c519c2a6607266b58f02 which is
+commit 66f99628eb24409cb8feb5061f78283c8b65f820 upstream.
+
+It is reported to cause problems on 5.4.y so it should be reverted for
+now.
+
+Reported-by: Shuah Khan <skhan@linuxfoundation.org>
+Link: https://lore.kernel.org/r/7af02bc3-c0f2-7326-e467-02549e88c9ce@linuxfoundation.org
+Cc: Hamza Mahfooz <hamza.mahfooz@amd.com>
+Cc: Alex Deucher <alexander.deucher@amd.com>
+Cc: Alex Deucher <alexander.deucher@amd.com>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+@@ -35,7 +35,6 @@
+ #include <linux/pci.h>
+ #include <linux/pm_runtime.h>
+ #include <drm/drm_crtc_helper.h>
+-#include <drm/drm_damage_helper.h>
+ #include <drm/drm_edid.h>
+ #include <drm/drm_gem_framebuffer_helper.h>
+ #include <drm/drm_fb_helper.h>
+@@ -496,7 +495,6 @@ bool amdgpu_display_ddc_probe(struct amd
+ static const struct drm_framebuffer_funcs amdgpu_fb_funcs = {
+ 	.destroy = drm_gem_fb_destroy,
+ 	.create_handle = drm_gem_fb_create_handle,
+-	.dirty = drm_atomic_helper_dirtyfb,
+ };
+ 
+ uint32_t amdgpu_display_supported_domains(struct amdgpu_device *adev,
diff --git a/queue-5.4/series b/queue-5.4/series
index 5056b02a0e1..2b10d91deea 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -46,3 +46,4 @@ xfs-move-incore-structures-out-of-xfs_da_format.h.patch
 xfs-streamline-xfs_attr3_leaf_inactive.patch
 xfs-fix-uninitialized-variable-in-xfs_attr3_leaf_inactive.patch
 xfs-remove-unused-variable-done.patch
+revert-drm-amdgpu-use-dirty-framebuffer-helper.patch