Skip to contentSkip to conversation

Revert "drm/amdgpu: use dirty framebuffer helper"

PATCH In review Hamza Mahfooz 3 participants 3 messages Oct 5, 2022 – Oct 6, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "drm/amdgpu: use dirty framebuffer helper"

This reverts commit 10b6e91bd1ee9cd237ffbc244ad9c25b5fd3e167.

Unfortunately, this commit causes performance regressions on non-PSR setups. So, just revert it until FB_DAMAGE_CLIPS support can be added.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +2 -12
index 23998f727c7f..1a06b8d724f3 100644
@@ -38,8 +38,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_drv.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_fb_helper.h>
@@ -500,12 +498,6 @@ static const struct drm_framebuffer_funcs amdgpu_fb_funcs = {
 	.create_handle = drm_gem_fb_create_handle,
 };
 
-static const struct drm_framebuffer_funcs amdgpu_fb_funcs_atomic = {
-	.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,
 					  uint64_t bo_flags)
 {
@@ -1108,10 +1100,8 @@ static int amdgpu_display_gem_fb_verify_and_init(struct drm_device *dev,
 	if (ret)
 		goto err;
 
-	if (drm_drv_uses_atomic_modeset(dev))
-		ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs_atomic);
-	else
-		ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);
+	ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);
+
 	if (ret)
 		goto err;
 
Signature · 1 line
2.37.3
Acked-by on v1 1/1
#1 lore raw
Quoted 54 lines · Hamza Mahfooz

This reverts commit 10b6e91bd1ee9cd237ffbc244ad9c25b5fd3e167.

Unfortunately, this commit causes performance regressions on non-PSR setups. So, just revert it until FB_DAMAGE_CLIPS support can be added.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +2 -13
index 23998f727c7f..1a06b8d724f3 100644
@@ -38,8 +38,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_drv.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_fb_helper.h>
@@ -500,12 +498,6 @@ static const struct drm_framebuffer_funcs amdgpu_fb_funcs = {
        .create_handle = drm_gem_fb_create_handle,
 };
 
-static const struct drm_framebuffer_funcs amdgpu_fb_funcs_atomic = {
-       .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,
                                          uint64_t bo_flags)
 {
@@ -1108,10 +1100,8 @@ static int amdgpu_display_gem_fb_verify_and_init(struct drm_device *dev,
        if (ret)
                goto err;
 
-       if (drm_drv_uses_atomic_modeset(dev))
-               ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs_atomic);
-       else
-               ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);
+       ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);
+
        if (ret)
                goto err;
 
--

2.37.3

#2 lore raw
In reply to Hamza Mahfooz

[CCing regression and stable lists, to make sure they are aware of the regression]

Quoted 1 line · Hamza Mahfooz

This reverts commit 10b6e91bd1ee9cd237ffbc244ad9c25b5fd3e167.

/me can't find that id and wonders what he did wrong -- or is this not meant to refer to Linus tree?

And isn't this reverting both 66f99628eb24409cb8feb5061f78283c8b65f820 and abbc7a3dafb91b9d4ec56b70ec9a7520f8e13334 in one go?

Quoted 5 lines

Unfortunately, this commit causes performance regressions on non-PSR setups. So, just revert it until FB_DAMAGE_CLIPS support can be added.

This seems to be missing a Reported-by tag, a CC: stable tag (needed to ensure backporting), and a Fixes: tag.

But the reason why I started writing this mail is totally different from the comments above:

In case you are not aware of it, that patch apparently broke amdgpu for some users of 5.4.215:
https://bugzilla.kernel.org/show_bug.cgi?id=216554

So more Link: and Reported-by: tags might would be nice.

Ciao, Thorsten

Quoted 43 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +2 -12
index 23998f727c7f..1a06b8d724f3 100644
@@ -38,8 +38,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_drv.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_fb_helper.h>
@@ -500,12 +498,6 @@ static const struct drm_framebuffer_funcs amdgpu_fb_funcs = {
 	.create_handle = drm_gem_fb_create_handle,
 };
 
-static const struct drm_framebuffer_funcs amdgpu_fb_funcs_atomic = {
-	.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,
 					  uint64_t bo_flags)
 {
@@ -1108,10 +1100,8 @@ static int amdgpu_display_gem_fb_verify_and_init(struct drm_device *dev,
 	if (ret)
 		goto err;
 
-	if (drm_drv_uses_atomic_modeset(dev))
-		ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs_atomic);
-	else
-		ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);
+	ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);
+
 	if (ret)
 		goto err;