diff options
Diffstat (limited to 'drivers/gpu/drm/lima/lima_drv.c')
| -rw-r--r-- | drivers/gpu/drm/lima/lima_drv.c | 22 | 
1 files changed, 4 insertions, 18 deletions
diff --git a/drivers/gpu/drm/lima/lima_drv.c b/drivers/gpu/drm/lima/lima_drv.c index 75ec703d22e0..124efe4fa97b 100644 --- a/drivers/gpu/drm/lima/lima_drv.c +++ b/drivers/gpu/drm/lima/lima_drv.c @@ -12,7 +12,6 @@  #include "lima_drv.h"  #include "lima_gem.h" -#include "lima_gem_prime.h"  #include "lima_vm.h"  int lima_sched_timeout_ms; @@ -240,16 +239,7 @@ static const struct drm_ioctl_desc lima_drm_driver_ioctls[] = {  	DRM_IOCTL_DEF_DRV(LIMA_CTX_FREE, lima_ioctl_ctx_free, DRM_RENDER_ALLOW),  }; -static const struct file_operations lima_drm_driver_fops = { -	.owner              = THIS_MODULE, -	.open               = drm_open, -	.release            = drm_release, -	.unlocked_ioctl     = drm_ioctl, -#ifdef CONFIG_COMPAT -	.compat_ioctl       = drm_compat_ioctl, -#endif -	.mmap               = lima_gem_mmap, -}; +DEFINE_DRM_GEM_FOPS(lima_drm_driver_fops);  static struct drm_driver lima_drm_driver = {  	.driver_features    = DRIVER_RENDER | DRIVER_GEM | DRIVER_SYNCOBJ, @@ -258,10 +248,6 @@ static struct drm_driver lima_drm_driver = {  	.ioctls             = lima_drm_driver_ioctls,  	.num_ioctls         = ARRAY_SIZE(lima_drm_driver_ioctls),  	.fops               = &lima_drm_driver_fops, -	.gem_free_object_unlocked = lima_gem_free_object, -	.gem_open_object    = lima_gem_object_open, -	.gem_close_object   = lima_gem_object_close, -	.gem_vm_ops         = &lima_gem_vm_ops,  	.name               = "lima",  	.desc               = "lima DRM",  	.date               = "20190217", @@ -269,11 +255,11 @@ static struct drm_driver lima_drm_driver = {  	.minor              = 0,  	.patchlevel         = 0, +	.gem_create_object  = lima_gem_create_object,  	.prime_fd_to_handle = drm_gem_prime_fd_to_handle, -	.gem_prime_import_sg_table = lima_gem_prime_import_sg_table, +	.gem_prime_import_sg_table = drm_gem_shmem_prime_import_sg_table,  	.prime_handle_to_fd = drm_gem_prime_handle_to_fd, -	.gem_prime_get_sg_table = lima_gem_prime_get_sg_table, -	.gem_prime_mmap = lima_gem_prime_mmap, +	.gem_prime_mmap = drm_gem_prime_mmap,  };  static int lima_pdev_probe(struct platform_device *pdev)  | 
