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

drm/qxl: implement prime kmap/kunmap 

Generic fbdev emulation needs this.  Also: We must keep track of the
number of mappings now, so we don't unmap early in case two users want a
kmap of the same bo.  Add a sanity check to destroy callback to make
sure kmap/kunmap is balanced.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Noralf Trønnes <noralf@tronnes.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20190118122020.27596-17-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2019-01-18 13:20:13 +01:00
parent 21c76bd19e
commit 9b369116fd
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/qxl/qxl_drv.h
View File

@ -84,6 +84,7 @@ struct qxl_bo {
struct ttm_bo_kmap_obj kmap; struct ttm_bo_kmap_obj kmap;
unsigned int pin_count; unsigned int pin_count;
void *kptr; void *kptr;
unsigned int map_count;
int type; int type;
/* Constant after initialization */ /* Constant after initialization */

6
drivers/gpu/drm/qxl/qxl_object.c
View File

@ -36,6 +36,7 @@ static void qxl_ttm_bo_destroy(struct ttm_buffer_object *tbo)
qdev = (struct qxl_device *)bo->gem_base.dev->dev_private; qdev = (struct qxl_device *)bo->gem_base.dev->dev_private;
qxl_surface_evict(qdev, bo, false); qxl_surface_evict(qdev, bo, false);
WARN_ON_ONCE(bo->map_count > 0);
mutex_lock(&qdev->gem.mutex); mutex_lock(&qdev->gem.mutex);
list_del_init(&bo->list); list_del_init(&bo->list);
mutex_unlock(&qdev->gem.mutex); mutex_unlock(&qdev->gem.mutex);
@ -131,6 +132,7 @@ int qxl_bo_kmap(struct qxl_bo *bo, void **ptr)
if (bo->kptr) { if (bo->kptr) {
if (ptr) if (ptr)
*ptr = bo->kptr; *ptr = bo->kptr;
bo->map_count++;
return 0; return 0;
} }
r = ttm_bo_kmap(&bo->tbo, 0, bo->tbo.num_pages, &bo->kmap); r = ttm_bo_kmap(&bo->tbo, 0, bo->tbo.num_pages, &bo->kmap);
@ -139,6 +141,7 @@ int qxl_bo_kmap(struct qxl_bo *bo, void **ptr)
bo->kptr = ttm_kmap_obj_virtual(&bo->kmap, &is_iomem); bo->kptr = ttm_kmap_obj_virtual(&bo->kmap, &is_iomem);
if (ptr) if (ptr)
*ptr = bo->kptr; *ptr = bo->kptr;
bo->map_count = 1;
return 0; return 0;
} }
@ -180,6 +183,9 @@ void qxl_bo_kunmap(struct qxl_bo *bo)
{ {
if (bo->kptr == NULL) if (bo->kptr == NULL)
return; return;
bo->map_count--;
if (bo->map_count > 0)
return;
bo->kptr = NULL; bo->kptr = NULL;
ttm_bo_kunmap(&bo->kmap); ttm_bo_kunmap(&bo->kmap);
} }

17
drivers/gpu/drm/qxl/qxl_prime.c
View File

@ -22,7 +22,7 @@
* Authors: Andreas Pokorny * Authors: Andreas Pokorny
*/ */
#include "qxl_drv.h" #include "qxl_object.h"
/* Empty Implementations as there should not be any other driver for a virtual /* Empty Implementations as there should not be any other driver for a virtual
* device that might share buffers with qxl */ * device that might share buffers with qxl */
@ -54,13 +54,22 @@ struct drm_gem_object *qxl_gem_prime_import_sg_table(
void *qxl_gem_prime_vmap(struct drm_gem_object *obj) void *qxl_gem_prime_vmap(struct drm_gem_object *obj)
{ {
WARN_ONCE(1, "not implemented"); struct qxl_bo *bo = gem_to_qxl_bo(obj);
return ERR_PTR(-ENOSYS); void *ptr;
int ret;
ret = qxl_bo_kmap(bo, &ptr);
if (ret < 0)
return ERR_PTR(ret);
return ptr;
} }
void qxl_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr) void qxl_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr)
{ {
WARN_ONCE(1, "not implemented"); struct qxl_bo *bo = gem_to_qxl_bo(obj);
qxl_bo_kunmap(bo);
} }
int qxl_gem_prime_mmap(struct drm_gem_object *obj, int qxl_gem_prime_mmap(struct drm_gem_object *obj,