Acked-by: Alex Deucher <alexander.deucher@xxxxxxx> On Wed, Oct 5, 2022 at 11:47 AM Hamza Mahfooz <hamza.mahfooz@xxxxxxx> wrote: > > 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. > > Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2189 > Signed-off-by: Hamza Mahfooz <hamza.mahfooz@xxxxxxx> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 14 ++------------ > 1 file changed, 2 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > index 23998f727c7f..1a06b8d724f3 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > @@ -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 >
