Commit a5073a5b authored by Shawn Guo's avatar Shawn Guo Committed by Sean Paul
Browse files

drm: mediatek: 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: CK Hu <ck.hu@mediatek.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1486458995-31018-14-git-send-email-shawnguo@kernel.org
parent d4f6750f

drivers/gpu/drm/mediatek/mtk_drm_crtc.c

+4 −4
Original line number Diff line number Diff line
@@ -168,9 +168,8 @@ static void mtk_drm_crtc_mode_set_nofb(struct drm_crtc *crtc) 
	state->pending_config = true;

}



int mtk_drm_crtc_enable_vblank(struct drm_device *drm, unsigned int pipe)

static int mtk_drm_crtc_enable_vblank(struct drm_crtc *crtc)

{

	struct drm_crtc *crtc = drm_crtc_from_index(drm, pipe);

	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0];
@@ -179,9 +178,8 @@ int mtk_drm_crtc_enable_vblank(struct drm_device *drm, unsigned int pipe) 
	return 0;

}



void mtk_drm_crtc_disable_vblank(struct drm_device *drm, unsigned int pipe)

static void mtk_drm_crtc_disable_vblank(struct drm_crtc *crtc)

{

	struct drm_crtc *crtc = drm_crtc_from_index(drm, pipe);

	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0];
@@ -436,6 +434,8 @@ static const struct drm_crtc_funcs mtk_crtc_funcs = { 
	.atomic_duplicate_state	= mtk_drm_crtc_duplicate_state,

	.atomic_destroy_state	= mtk_drm_crtc_destroy_state,

	.gamma_set		= drm_atomic_helper_legacy_gamma_set,

	.enable_vblank		= mtk_drm_crtc_enable_vblank,

	.disable_vblank		= mtk_drm_crtc_disable_vblank,

};



static const struct drm_crtc_helper_funcs mtk_crtc_helper_funcs = {

drivers/gpu/drm/mediatek/mtk_drm_crtc.h

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
#define MTK_MAX_BPC	10

#define MTK_MIN_BPC	3



int mtk_drm_crtc_enable_vblank(struct drm_device *drm, unsigned int pipe);

void mtk_drm_crtc_disable_vblank(struct drm_device *drm, unsigned int pipe);

void mtk_drm_crtc_commit(struct drm_crtc *crtc);

void mtk_crtc_ddp_irq(struct drm_crtc *crtc, struct mtk_ddp_comp *ovl);

int mtk_drm_crtc_create(struct drm_device *drm_dev,

drivers/gpu/drm/mediatek/mtk_drm_drv.c

+0 −3
Original line number Diff line number Diff line
@@ -256,9 +256,6 @@ static struct drm_driver mtk_drm_driver = { 
	.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME |

			   DRIVER_ATOMIC,



	.enable_vblank = mtk_drm_crtc_enable_vblank,

	.disable_vblank = mtk_drm_crtc_disable_vblank,



	.gem_free_object_unlocked = mtk_drm_gem_free_object,

	.gem_vm_ops = &drm_gem_cma_vm_ops,

	.dumb_create = mtk_drm_gem_dumb_create,

CRA Git | Maintained and supported by SUSTech CRA and CCSE