summaryrefslogtreecommitdiffstats
path: root/include/drm/drmP.h
diff options
context:
space:
mode:
authorMaarten Lankhorst2014-01-09 11:03:14 +0100
committerMaarten Lankhorst2014-09-30 14:04:00 +0200
commitb5e9c1a25fcf8a0d664606251a53b5caa6a19d08 (patch)
tree5cb0d5645e575253779965ecf326b578fa1ce9ca /include/drm/drmP.h
parentdrm/nouveau: assign fence_chan->name correctly (diff)
downloadkernel-qcow2-linux-b5e9c1a25fcf8a0d664606251a53b5caa6a19d08.tar.gz
kernel-qcow2-linux-b5e9c1a25fcf8a0d664606251a53b5caa6a19d08.tar.xz
kernel-qcow2-linux-b5e9c1a25fcf8a0d664606251a53b5caa6a19d08.zip
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 'include/drm/drmP.h')
-rw-r--r--include/drm/drmP.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index d2c2b7f3a4e2..53ed87698a74 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -87,6 +87,7 @@ struct drm_gem_object;
struct device_node;
struct videomode;
struct reservation_object;
+struct dma_buf_attachment;
/*
* 4 debug categories are defined:
@@ -570,7 +571,8 @@ struct drm_driver {
struct drm_gem_object *obj);
struct sg_table *(*gem_prime_get_sg_table)(struct drm_gem_object *obj);
struct drm_gem_object *(*gem_prime_import_sg_table)(
- struct drm_device *dev, size_t size,
+ struct drm_device *dev,
+ struct dma_buf_attachment *attach,
struct sg_table *sgt);
void *(*gem_prime_vmap)(struct drm_gem_object *obj);
void (*gem_prime_vunmap)(struct drm_gem_object *obj, void *vaddr);