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

Commit 1fe25980 authored by Shawn Guo's avatar Shawn Guo Committed by Daniel Vetter
Browse files

drm: hdlcd: use vblank hooks in struct drm_crtc_funcs 



The vblank hooks in struct drm_driver are deprecated and only meant for
legacy drivers.  For modern drivers with DRIVER_MODESET flag, the hooks
in struct drm_crtc_funcs should be used instead.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarLiviu Dudau <liviu.dudau@arm.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1486458995-31018-5-git-send-email-shawnguo@kernel.org
parent 5ac74757

drivers/gpu/drm/arm/hdlcd_crtc.c

+20 −0
Original line number Diff line number Diff line
@@ -42,6 +42,24 @@ static void hdlcd_crtc_cleanup(struct drm_crtc *crtc) 
	drm_crtc_cleanup(crtc);

}



static int hdlcd_crtc_enable_vblank(struct drm_crtc *crtc)

{

	struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);

	unsigned int mask = hdlcd_read(hdlcd, HDLCD_REG_INT_MASK);



	hdlcd_write(hdlcd, HDLCD_REG_INT_MASK, mask | HDLCD_INTERRUPT_VSYNC);



	return 0;

}



static void hdlcd_crtc_disable_vblank(struct drm_crtc *crtc)

{

	struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);

	unsigned int mask = hdlcd_read(hdlcd, HDLCD_REG_INT_MASK);



	hdlcd_write(hdlcd, HDLCD_REG_INT_MASK, mask & ~HDLCD_INTERRUPT_VSYNC);

}



static const struct drm_crtc_funcs hdlcd_crtc_funcs = {

	.destroy = hdlcd_crtc_cleanup,

	.set_config = drm_atomic_helper_set_config,
@@ -49,6 +67,8 @@ static const struct drm_crtc_funcs hdlcd_crtc_funcs = { 
	.reset = drm_atomic_helper_crtc_reset,

	.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,

	.enable_vblank = hdlcd_crtc_enable_vblank,

	.disable_vblank = hdlcd_crtc_disable_vblank,

};



static struct simplefb_format supported_formats[] = SIMPLEFB_FORMATS;

drivers/gpu/drm/arm/hdlcd_drv.c

+0 −20
Original line number Diff line number Diff line
@@ -199,24 +199,6 @@ static void hdlcd_irq_uninstall(struct drm_device *drm) 
	hdlcd_write(hdlcd, HDLCD_REG_INT_MASK, irq_mask);

}



static int hdlcd_enable_vblank(struct drm_device *drm, unsigned int crtc)

{

	struct hdlcd_drm_private *hdlcd = drm->dev_private;

	unsigned int mask = hdlcd_read(hdlcd, HDLCD_REG_INT_MASK);



	hdlcd_write(hdlcd, HDLCD_REG_INT_MASK, mask | HDLCD_INTERRUPT_VSYNC);



	return 0;

}



static void hdlcd_disable_vblank(struct drm_device *drm, unsigned int crtc)

{

	struct hdlcd_drm_private *hdlcd = drm->dev_private;

	unsigned int mask = hdlcd_read(hdlcd, HDLCD_REG_INT_MASK);



	hdlcd_write(hdlcd, HDLCD_REG_INT_MASK, mask & ~HDLCD_INTERRUPT_VSYNC);

}



#ifdef CONFIG_DEBUG_FS

static int hdlcd_show_underrun_count(struct seq_file *m, void *arg)

{
@@ -278,8 +260,6 @@ static struct drm_driver hdlcd_driver = { 
	.irq_preinstall = hdlcd_irq_preinstall,

	.irq_postinstall = hdlcd_irq_postinstall,

	.irq_uninstall = hdlcd_irq_uninstall,

	.enable_vblank = hdlcd_enable_vblank,

	.disable_vblank = hdlcd_disable_vblank,

	.gem_free_object_unlocked = drm_gem_cma_free_object,

	.gem_vm_ops = &drm_gem_cma_vm_ops,

	.dumb_create = drm_gem_cma_dumb_create,