Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d55f7e5d authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Create DEFINE_DRM_GEM_CMA_FOPS and roll it out to drivers 



Less code ftw.

This converts all drivers except the tinydrm helper module. That one
needs more work, since it gets the THIS_MODULE reference from
tinydrm.ko instead of the actual driver module like it should.
Probably needs a similar trick like I used here with generating the
entire struct with a macro.

Cc: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Reviewed-by: default avatarLiviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170308141257.12119-24-daniel.vetter@ffwll.ch
parent 098899fe

drivers/gpu/drm/arm/hdlcd_drv.c

+1 −11
Original line number Diff line number Diff line
@@ -239,17 +239,7 @@ static int hdlcd_debugfs_init(struct drm_minor *minor) 
}

#endif



static const struct file_operations fops = {

	.owner		= THIS_MODULE,

	.open		= drm_open,

	.release	= drm_release,

	.unlocked_ioctl	= drm_ioctl,

	.compat_ioctl	= drm_compat_ioctl,

	.poll		= drm_poll,

	.read		= drm_read,

	.llseek		= noop_llseek,

	.mmap		= drm_gem_cma_mmap,

};

DEFINE_DRM_GEM_CMA_FOPS(fops);



static struct drm_driver hdlcd_driver = {

	.driver_features = DRIVER_HAVE_IRQ | DRIVER_GEM |

drivers/gpu/drm/arm/malidp_drv.c

+1 −11
Original line number Diff line number Diff line
@@ -178,17 +178,7 @@ static void malidp_lastclose(struct drm_device *drm) 
	drm_fbdev_cma_restore_mode(malidp->fbdev);

}



static const struct file_operations fops = {

	.owner = THIS_MODULE,

	.open = drm_open,

	.release = drm_release,

	.unlocked_ioctl = drm_ioctl,

	.compat_ioctl = drm_compat_ioctl,

	.poll = drm_poll,

	.read = drm_read,

	.llseek = noop_llseek,

	.mmap = drm_gem_cma_mmap,

};

DEFINE_DRM_GEM_CMA_FOPS(fops);



static struct drm_driver malidp_driver = {

	.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC |

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c

+1 −11
Original line number Diff line number Diff line
@@ -724,17 +724,7 @@ static void atmel_hlcdc_dc_irq_uninstall(struct drm_device *dev) 
	regmap_read(dc->hlcdc->regmap, ATMEL_HLCDC_ISR, &isr);

}



static const struct file_operations fops = {

	.owner              = THIS_MODULE,

	.open               = drm_open,

	.release            = drm_release,

	.unlocked_ioctl     = drm_ioctl,

	.compat_ioctl       = drm_compat_ioctl,

	.poll               = drm_poll,

	.read               = drm_read,

	.llseek             = no_llseek,

	.mmap               = drm_gem_cma_mmap,

};

DEFINE_DRM_GEM_CMA_FOPS(fops);



static struct drm_driver atmel_hlcdc_dc_driver = {

	.driver_features = DRIVER_HAVE_IRQ | DRIVER_GEM |

drivers/gpu/drm/drm_file.c

+3 −0
Original line number Diff line number Diff line
@@ -89,6 +89,9 @@ DEFINE_MUTEX(drm_global_mutex); 
 *             .mmap = drm_gem_mmap,

 *     };

 *

 * For CMA based drivers there is the DEFINE_DRM_GEM_CMA_FOPS() macro to make

 * this simpler.

 *

 * FIXME: We should have a macro for this (and the CMA version) so that drivers

 * don't have to repeat it all the time.

 */

drivers/gpu/drm/drm_gem_cma_helper.c

+3 −0
Original line number Diff line number Diff line
@@ -338,6 +338,9 @@ static int drm_gem_cma_mmap_obj(struct drm_gem_cma_object *cma_obj, 
 * as their ->mmap() handler in the DRM device file's file_operations

 * structure.

 *

 * Instead of directly referencing this function, drivers should use the

 * DEFINE_DRM_GEM_CMA_FOPS().macro.

 *

 * Returns:

 * 0 on success or a negative error code on failure.

 */