Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux

[firefly-linux-kernel-4.4.55.git] / drivers / staging / omapdrm / omap_drv.c

diff --git a/drivers/staging/omapdrm/omap_drv.c b/drivers/staging/omapdrm/omap_drv.c
index 1edbd777bf404f3ddeb86b66f4a5c8c28f7823b8..4beab9447ceb9b7def14b825645181308860f6a4 100644 (file)
--- 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,10 @@ 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,
+               .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,