lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 069/862] Revert "drm/amdgpu: use dirty framebuffer helper"
    Date
    From: Hamza Mahfooz <hamza.mahfooz@amd.com>

    commit 17d819e2828cacca2e4c909044eb9798ed379cd2 upstream.

    This reverts commit 66f99628eb24409cb8feb5061f78283c8b65f820.

    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: 66f99628eb2440 ("drm/amdgpu: use dirty framebuffer helper")
    Fixes: abbc7a3dafb91b ("drm/amdgpu: don't register a dirty callback for non-atomic")
    Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
    Acked-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 14 ++------------
    1 file changed, 2 insertions(+), 12 deletions(-)

    --- 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_func
    .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_
    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;


    \
     
     \ /
      Last update: 2022-10-19 10:47    [W:5.120 / U:0.752 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site