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 <tzimmermann@suse.de>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Maxime Ripard <mripard@kernel.org>
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 c9018ffff5f989124e732508e4828272a93da07a..bdfdf60e7bd8b15ec715bb699c6131d8841de791 100644 (file)
--- 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);
 }
 
 /**