From: Thomas Zimmermann Date: Fri, 20 Nov 2020 10:25:41 +0000 (+0100) Subject: drm/fb-helper: Separate shadow-buffer flushing and calling dirty callback X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fd2d856538bb3880ec78eae71bbbd928962bee35;p=linux.git drm/fb-helper: Separate shadow-buffer flushing and calling dirty callback Flushing the shadow framebuffer and invoking the dirty callback are two separate operations, so do them separately. The flush operation is paired with calls to vmap and vunmap. They are not needed for the dirty callback, which performs its own invocations if necessary. Signed-off-by: Thomas Zimmermann Reviewed-by: Sam Ravnborg Acked-by: Maxime Ripard Link: https://patchwork.freedesktop.org/patch/msgid/20201120102545.4047-7-tzimmermann@suse.de --- diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index c9018ffff5f98..bdfdf60e7bd8b 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -417,13 +417,11 @@ static void drm_fb_helper_damage_work(struct work_struct *work) if (ret) return; drm_fb_helper_damage_blit_real(helper, &clip_copy, &map); + drm_client_buffer_vunmap(helper->buffer); } if (helper->fb->funcs->dirty) helper->fb->funcs->dirty(helper->fb, NULL, 0, 0, &clip_copy, 1); - - if (helper->buffer) - drm_client_buffer_vunmap(helper->buffer); } /**