drm/udl: Vmap framebuffer after all tests succeeded in damage handling

We now do the fast tests before the potentially expensive vmap operation.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191206085954.9697-4-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
index ed6d9476b25b1acbc251fbfa490696e201fb14ae..dd7ba7f63214d3e05e5fd865ed5b2636705b1f4f 100644 (file)
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c
@@ -85,12 +85,6 @@ int udl_handle_damage(struct drm_framebuffer *fb, int x, int y,
        }
        spin_unlock(&udl->active_fb_16_lock);
 
-       vaddr = drm_gem_shmem_vmap(fb->obj[0]);
-       if (IS_ERR(vaddr)) {
-               DRM_ERROR("failed to vmap fb\n");
-               return 0;
-       }
-
        aligned_x = DL_ALIGN_DOWN(x, sizeof(unsigned long));
        width = DL_ALIGN_UP(width + (x-aligned_x), sizeof(unsigned long));
        x = aligned_x;
@@ -98,8 +92,13 @@ int udl_handle_damage(struct drm_framebuffer *fb, int x, int y,
        if ((width <= 0) ||
            (x + width > fb->width) ||
            (y + height > fb->height)) {
-               ret = -EINVAL;
-               goto err_drm_gem_shmem_vunmap;
+               return -EINVAL;
+       }
+
+       vaddr = drm_gem_shmem_vmap(fb->obj[0]);
+       if (IS_ERR(vaddr)) {
+               DRM_ERROR("failed to vmap fb\n");
+               return 0;
        }
 
        urb = udl_get_urb(dev);
@@ -131,10 +130,6 @@ out:
        drm_gem_shmem_vunmap(fb->obj[0], vaddr);
 
        return 0;
-
-err_drm_gem_shmem_vunmap:
-       drm_gem_shmem_vunmap(fb->obj[0], vaddr);
-       return ret;
 }
 
 static int udl_user_framebuffer_dirty(struct drm_framebuffer *fb,

diff --git a/drivers/gpu/drm/udl/udl_transfer.c b/drivers/gpu/drm/udl/udl_transfer.c
index 686358d1f669382ad52ef0adae08548d53c0f528..5fae48723286819922b72a7bd2e1c19cb3bb08f4 100644 (file)
--- a/drivers/gpu/drm/udl/udl_transfer.c
+++ b/drivers/gpu/drm/udl/udl_transfer.c
@@ -249,4 +249,3 @@ int udl_render_hline(struct drm_device *dev, int log_bpp, struct urb **urb_ptr,
 
        return 0;
 }
-