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

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

drm: malidp: 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: Mali DP Maintainers <malidp@foss.arm.com>
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-6-git-send-email-shawnguo@kernel.org
parent 1fe25980

drivers/gpu/drm/arm/malidp_crtc.c

+21 −0
Original line number Diff line number Diff line
@@ -167,6 +167,25 @@ static const struct drm_crtc_helper_funcs malidp_crtc_helper_funcs = { 
	.atomic_check = malidp_crtc_atomic_check,

};



static int malidp_crtc_enable_vblank(struct drm_crtc *crtc)

{

	struct malidp_drm *malidp = crtc_to_malidp_device(crtc);

	struct malidp_hw_device *hwdev = malidp->dev;



	malidp_hw_enable_irq(hwdev, MALIDP_DE_BLOCK,

			     hwdev->map.de_irq_map.vsync_irq);

	return 0;

}



static void malidp_crtc_disable_vblank(struct drm_crtc *crtc)

{

	struct malidp_drm *malidp = crtc_to_malidp_device(crtc);

	struct malidp_hw_device *hwdev = malidp->dev;



	malidp_hw_disable_irq(hwdev, MALIDP_DE_BLOCK,

			      hwdev->map.de_irq_map.vsync_irq);

}



static const struct drm_crtc_funcs malidp_crtc_funcs = {

	.destroy = drm_crtc_cleanup,

	.set_config = drm_atomic_helper_set_config,
@@ -174,6 +193,8 @@ static const struct drm_crtc_funcs malidp_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 = malidp_crtc_enable_vblank,

	.disable_vblank = malidp_crtc_disable_vblank,

};



int malidp_crtc_init(struct drm_device *drm)

drivers/gpu/drm/arm/malidp_drv.c

+0 −21
Original line number Diff line number Diff line
@@ -111,25 +111,6 @@ static const struct drm_mode_config_funcs malidp_mode_config_funcs = { 
	.atomic_commit = drm_atomic_helper_commit,

};



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

{

	struct malidp_drm *malidp = drm->dev_private;

	struct malidp_hw_device *hwdev = malidp->dev;



	malidp_hw_enable_irq(hwdev, MALIDP_DE_BLOCK,

			     hwdev->map.de_irq_map.vsync_irq);

	return 0;

}



static void malidp_disable_vblank(struct drm_device *drm, unsigned int pipe)

{

	struct malidp_drm *malidp = drm->dev_private;

	struct malidp_hw_device *hwdev = malidp->dev;



	malidp_hw_disable_irq(hwdev, MALIDP_DE_BLOCK,

			      hwdev->map.de_irq_map.vsync_irq);

}



static int malidp_init(struct drm_device *drm)

{

	int ret;
@@ -213,8 +194,6 @@ static struct drm_driver malidp_driver = { 
	.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC |

			   DRIVER_PRIME,

	.lastclose = malidp_lastclose,

	.enable_vblank = malidp_enable_vblank,

	.disable_vblank = malidp_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,