Commit 50480a78 authored by Shawn Guo's avatar Shawn Guo
Browse files

drm: sun4i: 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: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1486458995-31018-20-git-send-email-shawnguo@kernel.org
parent ee255863

drivers/gpu/drm/sun4i/sun4i_crtc.c

+24 −0
Original line number Diff line number Diff line
@@ -104,6 +104,28 @@ static const struct drm_crtc_helper_funcs sun4i_crtc_helper_funcs = { 
	.enable		= sun4i_crtc_enable,

};



static int sun4i_crtc_enable_vblank(struct drm_crtc *crtc)

{

	struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc);

	struct sun4i_drv *drv = scrtc->drv;



	DRM_DEBUG_DRIVER("Enabling VBLANK on crtc %p\n", crtc);



	sun4i_tcon_enable_vblank(drv->tcon, true);



	return 0;

}



static void sun4i_crtc_disable_vblank(struct drm_crtc *crtc)

{

	struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc);

	struct sun4i_drv *drv = scrtc->drv;



	DRM_DEBUG_DRIVER("Disabling VBLANK on crtc %p\n", crtc);



	sun4i_tcon_enable_vblank(drv->tcon, false);

}



static const struct drm_crtc_funcs sun4i_crtc_funcs = {

	.atomic_destroy_state	= drm_atomic_helper_crtc_destroy_state,

	.atomic_duplicate_state	= drm_atomic_helper_crtc_duplicate_state,
@@ -111,6 +133,8 @@ static const struct drm_crtc_funcs sun4i_crtc_funcs = { 
	.page_flip		= drm_atomic_helper_page_flip,

	.reset			= drm_atomic_helper_crtc_reset,

	.set_config		= drm_atomic_helper_set_config,

	.enable_vblank		= sun4i_crtc_enable_vblank,

	.disable_vblank		= sun4i_crtc_disable_vblank,

};



struct sun4i_crtc *sun4i_crtc_init(struct drm_device *drm)

drivers/gpu/drm/sun4i/sun4i_drv.c

+0 −27
Original line number Diff line number Diff line
@@ -24,29 +24,6 @@ 
#include "sun4i_drv.h"

#include "sun4i_framebuffer.h"

#include "sun4i_layer.h"

#include "sun4i_tcon.h"



static int sun4i_drv_enable_vblank(struct drm_device *drm, unsigned int pipe)

{

	struct sun4i_drv *drv = drm->dev_private;

	struct sun4i_tcon *tcon = drv->tcon;



	DRM_DEBUG_DRIVER("Enabling VBLANK on pipe %d\n", pipe);



	sun4i_tcon_enable_vblank(tcon, true);



	return 0;

}



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

{

	struct sun4i_drv *drv = drm->dev_private;

	struct sun4i_tcon *tcon = drv->tcon;



	DRM_DEBUG_DRIVER("Disabling VBLANK on pipe %d\n", pipe);



	sun4i_tcon_enable_vblank(tcon, false);

}



static const struct file_operations sun4i_drv_fops = {

	.owner		= THIS_MODULE,
@@ -90,10 +67,6 @@ static struct drm_driver sun4i_drv_driver = { 
	.gem_prime_mmap		= drm_gem_cma_prime_mmap,



	/* Frame Buffer Operations */



	/* VBlank Operations */

	.enable_vblank		= sun4i_drv_enable_vblank,

	.disable_vblank		= sun4i_drv_disable_vblank,

};



static void sun4i_remove_framebuffers(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE