drm/fb-helper: Move damage blit code and its setup into separate routine

Introduce a separate function for the blit code and its vmap setup. Done
in preparation of additional changes. No functional changes are made.

v3:
	* Use drm_WARN_ONCE() with an error message to print warning
v2:
	* print a single warning if damage blitter fails

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-8-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index bdfdf60e7bd8b15ec715bb699c6131d8841de791..fc709bc59b1a0c468ca651c78d7b3b33e85794b5 100644 (file)
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -391,14 +391,32 @@ static void drm_fb_helper_damage_blit_real(struct drm_fb_helper *fb_helper,
        }
 }
 
+static int drm_fb_helper_damage_blit(struct drm_fb_helper *fb_helper,
+                                    struct drm_clip_rect *clip)
+{
+       struct drm_client_buffer *buffer = fb_helper->buffer;
+       struct dma_buf_map map;
+       int ret;
+
+       ret = drm_client_buffer_vmap(buffer, &map);
+       if (ret)
+               return ret;
+
+       drm_fb_helper_damage_blit_real(fb_helper, clip, &map);
+
+       drm_client_buffer_vunmap(buffer);
+
+       return 0;
+}
+
 static void drm_fb_helper_damage_work(struct work_struct *work)
 {
        struct drm_fb_helper *helper = container_of(work, struct drm_fb_helper,
                                                    damage_work);
+       struct drm_device *dev = helper->dev;
        struct drm_clip_rect *clip = &helper->damage_clip;
        struct drm_clip_rect clip_copy;
        unsigned long flags;
-       struct dma_buf_map map;
        int ret;
 
        spin_lock_irqsave(&helper->damage_lock, flags);
@@ -411,13 +429,10 @@ static void drm_fb_helper_damage_work(struct work_struct *work)
        if (!(clip_copy.x1 < clip_copy.x2 && clip_copy.y1 < clip_copy.y2))
                return;
 
-       /* Generic fbdev uses a shadow buffer */
        if (helper->buffer) {
-               ret = drm_client_buffer_vmap(helper->buffer, &map);
-               if (ret)
+               ret = drm_fb_helper_damage_blit(helper, &clip_copy);
+               if (drm_WARN_ONCE(dev, ret, "Damage blitter failed: ret=%d\n", ret))
                        return;
-               drm_fb_helper_damage_blit_real(helper, &clip_copy, &map);
-               drm_client_buffer_vunmap(helper->buffer);
        }
 
        if (helper->fb->funcs->dirty)