iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Thomas Zimmermann 2019-12-06 09:59:50 +01:00
parent d15e35dafb
commit 2d2bebb833
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/udl/udl_fb.c
View File

@ -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,

1
drivers/gpu/drm/udl/udl_transfer.c
View File

@ -249,4 +249,3 @@ int udl_render_hline(struct drm_device *dev, int log_bpp, struct urb **urb_ptr,
return 0;
}