aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/qxl
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>2014-01-09 05:03:14 -0500
committerMaarten Lankhorst <maarten.lankhorst@canonical.com>2014-09-30 08:04:00 -0400
commitb5e9c1a25fcf8a0d664606251a53b5caa6a19d08 (patch)
tree5cb0d5645e575253779965ecf326b578fa1ce9ca /drivers/gpu/drm/qxl
parent15a996bbb6978ae21c497aeadfe20deca6ddd07a (diff)
drm: Pass dma-buf as argument to gem_prime_import_sg_table
Allows importing dma_reservation_objects from a dma-buf. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Diffstat (limited to 'drivers/gpu/drm/qxl')
-rw-r--r--drivers/gpu/drm/qxl/qxl_drv.h2
-rw-r--r--drivers/gpu/drm/qxl/qxl_prime.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
index ff0772728eb0..7c6cafe21f5f 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -537,7 +537,7 @@ int qxl_gem_prime_pin(struct drm_gem_object *obj);
537void qxl_gem_prime_unpin(struct drm_gem_object *obj); 537void qxl_gem_prime_unpin(struct drm_gem_object *obj);
538struct sg_table *qxl_gem_prime_get_sg_table(struct drm_gem_object *obj); 538struct sg_table *qxl_gem_prime_get_sg_table(struct drm_gem_object *obj);
539struct drm_gem_object *qxl_gem_prime_import_sg_table( 539struct drm_gem_object *qxl_gem_prime_import_sg_table(
540 struct drm_device *dev, size_t size, 540 struct drm_device *dev, struct dma_buf_attachment *attach,
541 struct sg_table *sgt); 541 struct sg_table *sgt);
542void *qxl_gem_prime_vmap(struct drm_gem_object *obj); 542void *qxl_gem_prime_vmap(struct drm_gem_object *obj);
543void qxl_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr); 543void qxl_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
diff --git a/drivers/gpu/drm/qxl/qxl_prime.c b/drivers/gpu/drm/qxl/qxl_prime.c
index ba0689c728e8..3d031b50a8fd 100644
--- a/drivers/gpu/drm/qxl/qxl_prime.c
+++ b/drivers/gpu/drm/qxl/qxl_prime.c
@@ -46,7 +46,7 @@ struct sg_table *qxl_gem_prime_get_sg_table(struct drm_gem_object *obj)
46} 46}
47 47
48struct drm_gem_object *qxl_gem_prime_import_sg_table( 48struct drm_gem_object *qxl_gem_prime_import_sg_table(
49 struct drm_device *dev, size_t size, 49 struct drm_device *dev, struct dma_buf_attachment *attach,
50 struct sg_table *table) 50 struct sg_table *table)
51{ 51{
52 WARN_ONCE(1, "not implemented"); 52 WARN_ONCE(1, "not implemented");