summaryrefslogtreecommitdiff
path: root/drivers/staging/omapdrm/omap_drv.c
diff options
context:
space:
mode:
authorRob Clark <rob@ti.com>2012-05-17 02:37:26 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-17 08:54:09 -0700
commit3080b838158f1b17bd806c3fd7b9086ba3054a04 (patch)
treede5bc96bd1dd934e8d689197887350f092c0858f /drivers/staging/omapdrm/omap_drv.c
parent8b6b569eac2e74d0b2a1822790f725a9a6abc2be (diff)
staging: drm/omap: initial dmabuf/prime import support
This adds support to re-import omapdrm's own buffers. Importing buffers allocated by other drivers can be added later, but for now is not needed (we don't yet have any other exportering drivers to test with). Signed-off-by: Rob Clark <rob@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/omapdrm/omap_drv.c')
-rw-r--r--drivers/staging/omapdrm/omap_drv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/omapdrm/omap_drv.c b/drivers/staging/omapdrm/omap_drv.c
index 1f559f445a30..0d2acca376ca 100644
--- a/drivers/staging/omapdrm/omap_drv.c
+++ b/drivers/staging/omapdrm/omap_drv.c
@@ -767,7 +767,9 @@ static struct drm_driver omap_drm_driver = {
.debugfs_cleanup = omap_debugfs_cleanup,
#endif
.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
+ .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
.gem_prime_export = omap_gem_prime_export,
+ .gem_prime_import = omap_gem_prime_import,
.gem_init_object = omap_gem_init_object,
.gem_free_object = omap_gem_free_object,
.gem_vm_ops = &omap_gem_vm_ops,