diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2013-01-15 20:47:43 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-02-08 13:39:09 +1000 |
| commit | ab9ccb96a6e6f95bcde6b8b2a524370efdbfdcd6 (patch) | |
| tree | 132cc3a4707a5a7661dc1fb86d6b7758ab7f0156 /drivers/gpu/drm/nouveau/nouveau_gem.h | |
| parent | 89177644a7b6306e6084a89eab7e290f4bfef397 (diff) | |
| download | blackbird-obmc-linux-ab9ccb96a6e6f95bcde6b8b2a524370efdbfdcd6.tar.gz blackbird-obmc-linux-ab9ccb96a6e6f95bcde6b8b2a524370efdbfdcd6.zip | |
drm/nouveau: use prime helpers
Simplify the Nouveau prime implementation by using the default behavior provided
by drm_gem_prime_import and drm_gem_prime_export.
v2: Rename functions to nouveau_gem_prime_get_sg_table and
nouveau_gem_prime_import_sg_table.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: David Airlie <airlied@linux.ie>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_gem.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_gem.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.h b/drivers/gpu/drm/nouveau/nouveau_gem.h index 5c1049236d22..8d7a3f0aeb86 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.h +++ b/drivers/gpu/drm/nouveau/nouveau_gem.h @@ -35,9 +35,11 @@ extern int nouveau_gem_ioctl_cpu_fini(struct drm_device *, void *, extern int nouveau_gem_ioctl_info(struct drm_device *, void *, struct drm_file *); -extern struct dma_buf *nouveau_gem_prime_export(struct drm_device *dev, - struct drm_gem_object *obj, int flags); -extern struct drm_gem_object *nouveau_gem_prime_import(struct drm_device *dev, - struct dma_buf *dma_buf); +extern int nouveau_gem_prime_pin(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 *); +extern void *nouveau_gem_prime_vmap(struct drm_gem_object *); +extern void nouveau_gem_prime_vunmap(struct drm_gem_object *, void *); #endif |
