Commit 0d5f46fa authored by Shawn Guo's avatar Shawn Guo
Browse files

drm: vc4: 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: Eric Anholt <eric@anholt.net>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Link: http://patchwork.freedesktop.org/patch/msgid/1486458995-31018-23-git-send-email-shawnguo@kernel.org
parent 55cbc4df

drivers/gpu/drm/vc4/vc4_crtc.c

+4 −4
Original line number Diff line number Diff line
@@ -654,9 +654,8 @@ static void vc4_crtc_atomic_flush(struct drm_crtc *crtc, 
	}

}



int vc4_enable_vblank(struct drm_device *dev, unsigned int crtc_id)

static int vc4_enable_vblank(struct drm_crtc *crtc)

{

	struct drm_crtc *crtc = drm_crtc_from_index(dev, crtc_id);

	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);



	CRTC_WRITE(PV_INTEN, PV_INT_VFP_START);
@@ -664,9 +663,8 @@ int vc4_enable_vblank(struct drm_device *dev, unsigned int crtc_id) 
	return 0;

}



void vc4_disable_vblank(struct drm_device *dev, unsigned int crtc_id)

static void vc4_disable_vblank(struct drm_crtc *crtc)

{

	struct drm_crtc *crtc = drm_crtc_from_index(dev, crtc_id);

	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);



	CRTC_WRITE(PV_INTEN, 0);
@@ -857,6 +855,8 @@ static const struct drm_crtc_funcs vc4_crtc_funcs = { 
	.atomic_duplicate_state = vc4_crtc_duplicate_state,

	.atomic_destroy_state = vc4_crtc_destroy_state,

	.gamma_set = vc4_crtc_gamma_set,

	.enable_vblank = vc4_enable_vblank,

	.disable_vblank = vc4_disable_vblank,

};



static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = {

drivers/gpu/drm/vc4/vc4_drv.c

+0 −2
Original line number Diff line number Diff line
@@ -137,8 +137,6 @@ static struct drm_driver vc4_drm_driver = { 
	.irq_postinstall = vc4_irq_postinstall,

	.irq_uninstall = vc4_irq_uninstall,



	.enable_vblank = vc4_enable_vblank,

	.disable_vblank = vc4_disable_vblank,

	.get_scanout_position = vc4_crtc_get_scanoutpos,

	.get_vblank_timestamp = vc4_crtc_get_vblank_timestamp,

drivers/gpu/drm/vc4/vc4_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -444,8 +444,6 @@ int vc4_bo_stats_debugfs(struct seq_file *m, void *arg); 


/* vc4_crtc.c */

extern struct platform_driver vc4_crtc_driver;

int vc4_enable_vblank(struct drm_device *dev, unsigned int crtc_id);

void vc4_disable_vblank(struct drm_device *dev, unsigned int crtc_id);

bool vc4_event_pending(struct drm_crtc *crtc);

int vc4_crtc_debugfs_regs(struct seq_file *m, void *arg);

int vc4_crtc_get_scanoutpos(struct drm_device *dev, unsigned int crtc_id,

CRA Git | Maintained and supported by SUSTech CRA and CCSE