Introduce a separate function for the blit code and its vmap setup. Done
in preparation of additional changes. No functional changes are made.
v2:
* print a single warning if damage blitter fails
Signed-off-by: Thomas Zimmermann
---
drivers/gpu/drm/drm_fb_helper.c | 27 +--
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index bdfdf60e7bd8..b0bde894bf39 100644
--- 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, );
+ if (ret)
+ return ret;
+
+ drm_fb_helper_damage_blit_real(fb_helper, clip, );
+
+ 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 = >damage_clip;
struct drm_clip_rect clip_copy;
unsigned long flags;
- struct dma_buf_map map;
int ret;
spin_lock_irqsave(>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, );
- if (ret)
+ ret = drm_fb_helper_damage_blit(helper, _copy);
+ if (drm_WARN_ON_ONCE(dev, ret))
return;
- drm_fb_helper_damage_blit_real(helper, _copy, );
- drm_client_buffer_vunmap(helper->buffer);
}
if (helper->fb->funcs->dirty)
--
2.29.2
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
