diff options
| author | Rob Clark <rob@ti.com> | 2012-04-10 13:19:55 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-10 11:25:59 -0700 |
| commit | 6ad11bc3a0b84deb39f581ed36e19f82b9393695 (patch) | |
| tree | de9c3acbe1b1d7e3699ca63550cd718b1f5679bb /drivers/staging/omapdrm/omap_drv.c | |
| parent | b3f79f980a07fabe22d553fb75010d5d0a12c943 (diff) | |
| download | linux-stable-6ad11bc3a0b84deb39f581ed36e19f82b9393695.tar.gz linux-stable-6ad11bc3a0b84deb39f581ed36e19f82b9393695.tar.bz2 linux-stable-6ad11bc3a0b84deb39f581ed36e19f82b9393695.zip | |
staging: drm/omap: dmabuf/prime support
For now just implementing the exporting APIs, not yet importing. And
kmap is rejected on tiled buffers (although the usefulness of that seems
questionable, but could be added later if needed).
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.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/omapdrm/omap_drv.c b/drivers/staging/omapdrm/omap_drv.c index 3df5b4c58ecd..d6c602b193c5 100644 --- a/drivers/staging/omapdrm/omap_drv.c +++ b/drivers/staging/omapdrm/omap_drv.c @@ -746,7 +746,7 @@ static const struct file_operations omapdriver_fops = { static struct drm_driver omap_drm_driver = { .driver_features = - DRIVER_HAVE_IRQ | DRIVER_MODESET | DRIVER_GEM, + DRIVER_HAVE_IRQ | DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME, .load = dev_load, .unload = dev_unload, .open = dev_open, @@ -766,6 +766,8 @@ static struct drm_driver omap_drm_driver = { .debugfs_init = omap_debugfs_init, .debugfs_cleanup = omap_debugfs_cleanup, #endif + .prime_handle_to_fd = drm_gem_prime_handle_to_fd, + .gem_prime_export = omap_gem_prime_export, .gem_init_object = omap_gem_init_object, .gem_free_object = omap_gem_free_object, .gem_vm_ops = &omap_gem_vm_ops, |