Skip to content

Commit 21b0301

Browse files
alexdeuchergregkh
authored andcommitted
drm/amdgpu: don't register a dirty callback for non-atomic
[ Upstream commit abbc7a3 ] Some asics still support non-atomic code paths. Fixes: 66f9962 ("drm/amdgpu: use dirty framebuffer helper") Reported-by: Arthur Marsh <[email protected]> Reviewed-by: Hamza Mahfooz <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 6eb0824 commit 21b0301

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#include <linux/pm_runtime.h>
3737
#include <drm/drm_crtc_helper.h>
3838
#include <drm/drm_damage_helper.h>
39+
#include <drm/drm_drv.h>
3940
#include <drm/drm_edid.h>
4041
#include <drm/drm_gem_framebuffer_helper.h>
4142
#include <drm/drm_fb_helper.h>
@@ -491,6 +492,11 @@ bool amdgpu_display_ddc_probe(struct amdgpu_connector *amdgpu_connector,
491492
static const struct drm_framebuffer_funcs amdgpu_fb_funcs = {
492493
.destroy = drm_gem_fb_destroy,
493494
.create_handle = drm_gem_fb_create_handle,
495+
};
496+
497+
static const struct drm_framebuffer_funcs amdgpu_fb_funcs_atomic = {
498+
.destroy = drm_gem_fb_destroy,
499+
.create_handle = drm_gem_fb_create_handle,
494500
.dirty = drm_atomic_helper_dirtyfb,
495501
};
496502

@@ -1111,7 +1117,10 @@ int amdgpu_display_gem_fb_verify_and_init(
11111117
if (ret)
11121118
goto err;
11131119

1114-
ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);
1120+
if (drm_drv_uses_atomic_modeset(dev))
1121+
ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs_atomic);
1122+
else
1123+
ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);
11151124
if (ret)
11161125
goto err;
11171126

0 commit comments

Comments
 (0)