Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / etnaviv / etnaviv_drv.c

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
index 79b3bcd9f4444ec805418e35aa98af5b64adf698..f0a07278ad047187904f62251d9d02687b696a5f 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@ -468,12 +468,6 @@ static const struct drm_ioctl_desc etnaviv_ioctls[] = {
        ETNA_IOCTL(PM_QUERY_SIG, pm_query_sig, DRM_RENDER_ALLOW),
 };
 
-static const struct vm_operations_struct vm_ops = {
-       .fault = etnaviv_gem_fault,
-       .open = drm_gem_vm_open,
-       .close = drm_gem_vm_close,
-};
-
 static const struct file_operations fops = {
        .owner              = THIS_MODULE,
        .open               = drm_open,
@@ -486,20 +480,13 @@ static const struct file_operations fops = {
        .mmap               = etnaviv_gem_mmap,
 };
 
-static struct drm_driver etnaviv_drm_driver = {
+static const struct drm_driver etnaviv_drm_driver = {
        .driver_features    = DRIVER_GEM | DRIVER_RENDER,
        .open               = etnaviv_open,
        .postclose           = etnaviv_postclose,
-       .gem_free_object_unlocked = etnaviv_gem_free_object,
-       .gem_vm_ops         = &vm_ops,
        .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
        .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
-       .gem_prime_pin      = etnaviv_gem_prime_pin,
-       .gem_prime_unpin    = etnaviv_gem_prime_unpin,
-       .gem_prime_get_sg_table = etnaviv_gem_prime_get_sg_table,
        .gem_prime_import_sg_table = etnaviv_gem_prime_import_sg_table,
-       .gem_prime_vmap     = etnaviv_gem_prime_vmap,
-       .gem_prime_vunmap   = etnaviv_gem_prime_vunmap,
        .gem_prime_mmap     = etnaviv_gem_prime_mmap,
 #ifdef CONFIG_DEBUG_FS
        .debugfs_init       = etnaviv_debugfs_init,