summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nouveau_drv.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-12-21 11:30:31 +0000
committerDave Airlie <airlied@redhat.com>2011-12-21 17:18:25 +0000
commit9f877b95d836ffbec66d5db7e2359d748900a998 (patch)
tree412de50d42b9bd7126cd67da0c3ac51355ca17af /drivers/gpu/drm/nouveau/nouveau_drv.c
parent91d3c9674804f33b25979b2efd6cdcceaafa1f42 (diff)
nouveau: add prime support.drm-prime-dmabuf
this involves changing the nouveau_bo_new api.
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drv.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index 9791d13c9e3b..7d19dd043186 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -392,7 +392,7 @@ static struct drm_driver driver = {
.driver_features =
DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG |
DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |
- DRIVER_MODESET,
+ DRIVER_MODESET | DRIVER_PRIME,
.load = nouveau_load,
.firstopen = nouveau_firstopen,
.lastclose = nouveau_lastclose,
@@ -428,6 +428,9 @@ static struct drm_driver driver = {
.llseek = noop_llseek,
},
+ .prime_handle_to_fd = nouveau_gem_prime_handle_to_fd,
+ .prime_fd_to_handle = nouveau_gem_prime_fd_to_handle,
+
.gem_init_object = nouveau_gem_object_new,
.gem_free_object = nouveau_gem_object_del,
.gem_open_object = nouveau_gem_object_open,