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

Commit 14de02cd authored by Shawn Guo's avatar Shawn Guo
Browse files

drm: hibmc: 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>
Cc: Xinliang Liu <z.liuxinliang@hisilicon.com>
Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1486458995-31018-11-git-send-email-shawnguo@kernel.org
parent 0396162a

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c

+20 −0
Original line number Diff line number Diff line
@@ -423,6 +423,24 @@ static void hibmc_crtc_atomic_flush(struct drm_crtc *crtc, 
	spin_unlock_irqrestore(&crtc->dev->event_lock, flags);

}



static int hibmc_crtc_enable_vblank(struct drm_crtc *crtc)

{

	struct hibmc_drm_private *priv = crtc->dev->dev_private;



	writel(HIBMC_RAW_INTERRUPT_EN_VBLANK(1),

	       priv->mmio + HIBMC_RAW_INTERRUPT_EN);



	return 0;

}



static void hibmc_crtc_disable_vblank(struct drm_crtc *crtc)

{

	struct hibmc_drm_private *priv = crtc->dev->dev_private;



	writel(HIBMC_RAW_INTERRUPT_EN_VBLANK(0),

	       priv->mmio + HIBMC_RAW_INTERRUPT_EN);

}



static const struct drm_crtc_funcs hibmc_crtc_funcs = {

	.page_flip = drm_atomic_helper_page_flip,

	.set_config = drm_atomic_helper_set_config,
@@ -430,6 +448,8 @@ static const struct drm_crtc_funcs hibmc_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 = hibmc_crtc_enable_vblank,

	.disable_vblank = hibmc_crtc_disable_vblank,

};



static const struct drm_crtc_helper_funcs hibmc_crtc_helper_funcs = {

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c

+0 −22
Original line number Diff line number Diff line
@@ -37,26 +37,6 @@ static const struct file_operations hibmc_fops = { 
	.llseek		= no_llseek,

};



static int hibmc_enable_vblank(struct drm_device *dev, unsigned int pipe)

{

	struct hibmc_drm_private *priv =

		(struct hibmc_drm_private *)dev->dev_private;



	writel(HIBMC_RAW_INTERRUPT_EN_VBLANK(1),

	       priv->mmio + HIBMC_RAW_INTERRUPT_EN);



	return 0;

}



static void hibmc_disable_vblank(struct drm_device *dev, unsigned int pipe)

{

	struct hibmc_drm_private *priv =

		(struct hibmc_drm_private *)dev->dev_private;



	writel(HIBMC_RAW_INTERRUPT_EN_VBLANK(0),

	       priv->mmio + HIBMC_RAW_INTERRUPT_EN);

}



irqreturn_t hibmc_drm_interrupt(int irq, void *arg)

{

	struct drm_device *dev = (struct drm_device *)arg;
@@ -84,8 +64,6 @@ static struct drm_driver hibmc_driver = { 
	.desc			= "hibmc drm driver",

	.major			= 1,

	.minor			= 0,

	.enable_vblank		= hibmc_enable_vblank,

	.disable_vblank		= hibmc_disable_vblank,

	.gem_free_object_unlocked = hibmc_gem_free_object,

	.dumb_create            = hibmc_dumb_create,

	.dumb_map_offset        = hibmc_dumb_mmap_offset,