Commit 17d819e2 authored by Hamza Mahfooz's avatar Hamza Mahfooz Committed by Alex Deucher
Browse files

Revert "drm/amdgpu: use dirty framebuffer helper" 

This reverts commit 66f99628.

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

Cc: stable@vger.kernel.org
Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2189
Link: https://bugzilla.kernel.org/show_bug.cgi?id=216554


Fixes: 66f99628 ("drm/amdgpu: use dirty framebuffer helper")
Fixes: abbc7a3d ("drm/amdgpu: don't register a dirty callback for non-atomic")
Signed-off-by: default avatarHamza Mahfooz <hamza.mahfooz@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2302d507

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c

+2 −12
Original line number Diff line number Diff line
@@ -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);



	if (ret)

		goto err;