diff options
| author |   Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-01-09 11:03:14 +0100 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-09-30 14:04:00 +0200 |
| commit | b5e9c1a25fcf8a0d664606251a53b5caa6a19d08 (patch) | |
| tree | 5cb0d5645e575253779965ecf326b578fa1ce9ca /drivers/gpu/drm/nouveau/nouveau_gem.h | |
| parent | drm/nouveau: assign fence_chan->name correctly (diff) | |
| download | linux-dev-b5e9c1a25fcf8a0d664606251a53b5caa6a19d08.tar.xz linux-dev-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 'drivers/gpu/drm/nouveau/nouveau_gem.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_gem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.h b/drivers/gpu/drm/nouveau/nouveau_gem.h index ddab762d81fe..e4049faca780 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.h +++ b/drivers/gpu/drm/nouveau/nouveau_gem.h @@ -39,7 +39,7 @@ struct reservation_object *nouveau_gem_prime_res_obj(struct drm_gem_object *); extern void nouveau_gem_prime_unpin(struct drm_gem_object *); extern struct sg_table *nouveau_gem_prime_get_sg_table(struct drm_gem_object *); extern struct drm_gem_object *nouveau_gem_prime_import_sg_table( - struct drm_device *, size_t size, struct sg_table *); + struct drm_device *, struct dma_buf_attachment *, struct sg_table *); extern void *nouveau_gem_prime_vmap(struct drm_gem_object *); extern void nouveau_gem_prime_vunmap(struct drm_gem_object *, void *); |