GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 15:27:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/gem: Update internal GEM vmap/vunmap interfaces to use struct dma_buf_map

Browse source 
GEM's vmap and vunmap interfaces now wrap memory pointers in struct
dma_buf_map.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Tested-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20201103093015.1063-8-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2020-11-03 10:30:12 +01:00
parent 49a3f51dfe
commit a745fb1c26
4 changed files with 31 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

18
drivers/gpu/drm/drm_client.c
View file

@ -3,6 +3,7 @@
* Copyright 2018 Noralf Trønnes
*/
#include <linux/dma-buf-map.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/mutex.h>
@ -304,7 +305,8 @@ err_delete:
*/
void *drm_client_buffer_vmap(struct drm_client_buffer *buffer)
{
void *vaddr;
struct dma_buf_map map;
int ret;
if (buffer->vaddr)
return buffer->vaddr;
@ -317,13 +319,13 @@ void *drm_client_buffer_vmap(struct drm_client_buffer *buffer)
* fd_install step out of the driver backend hooks, to make that
* final step optional for internal users.
*/
vaddr = drm_gem_vmap(buffer->gem);
if (IS_ERR(vaddr))
return vaddr;
ret = drm_gem_vmap(buffer->gem, &map);
if (ret)
return ERR_PTR(ret);
buffer->vaddr = vaddr;
buffer->vaddr = map.vaddr;
return vaddr;
return map.vaddr;
}
EXPORT_SYMBOL(drm_client_buffer_vmap);
@ -337,7 +339,9 @@ EXPORT_SYMBOL(drm_client_buffer_vmap);
*/
void drm_client_buffer_vunmap(struct drm_client_buffer *buffer)
{
drm_gem_vunmap(buffer->gem, buffer->vaddr);
struct dma_buf_map map = DMA_BUF_MAP_INIT_VADDR(buffer->vaddr);
drm_gem_vunmap(buffer->gem, &map);
buffer->vaddr = NULL;
}
EXPORT_SYMBOL(drm_client_buffer_vunmap);