openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/mgag200: Use drm_gem_vram_{vmap, vunmap}() to map cursor source BO 

The VRAM helper's vmap interfaces provide pinning and mapping of BO
memory. This patch replaces the respective code in mgag200 cursor handling.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190911120352.20084-4-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2019-09-11 14:03:52 +02:00
parent 820d6606e9
commit dcc7b1f3ae
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/gpu/drm/mgag200/mgag200_cursor.c
View File

@ -85,17 +85,12 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,
if (!obj)
return -ENOENT;
gbo = drm_gem_vram_of_gem(obj);
ret = drm_gem_vram_pin(gbo, 0);
if (ret) {
dev_err(&dev->pdev->dev, "failed to lock user bo\n");
goto err_drm_gem_object_put_unlocked;
}
src = drm_gem_vram_kmap(gbo, true, NULL);
src = drm_gem_vram_vmap(gbo);
if (IS_ERR(src)) {
ret = PTR_ERR(src);
dev_err(&dev->pdev->dev,
"failed to kmap user buffer updates\n");
goto err_drm_gem_vram_unpin_src;
"failed to map user buffer updates\n");
goto err_drm_gem_object_put_unlocked;
}
/* Pin and map up-coming buffer to write colour indices */
@ -103,7 +98,7 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,
if (ret) {
dev_err(&dev->pdev->dev,
"failed to pin cursor buffer: %d\n", ret);
goto err_drm_gem_vram_kunmap_src;
goto err_drm_gem_vram_vunmap;
}
dst = drm_gem_vram_kmap(pixels_next, true, NULL);
if (IS_ERR(dst)) {
@ -213,8 +208,7 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,
mdev->cursor.pixels_current = pixels_next;
drm_gem_vram_kunmap(pixels_next);
drm_gem_vram_kunmap(gbo);
drm_gem_vram_unpin(gbo);
drm_gem_vram_vunmap(gbo, src);
drm_gem_object_put_unlocked(obj);
return 0;
@ -223,10 +217,8 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,
drm_gem_vram_kunmap(pixels_next);
err_drm_gem_vram_unpin_dst:
drm_gem_vram_unpin(pixels_next);
err_drm_gem_vram_kunmap_src:
drm_gem_vram_kunmap(gbo);
err_drm_gem_vram_unpin_src:
drm_gem_vram_unpin(gbo);
err_drm_gem_vram_vunmap:
drm_gem_vram_vunmap(gbo, src);
err_drm_gem_object_put_unlocked:
drm_gem_object_put_unlocked(obj);
return ret;