Commit df91972f authored by Oleksandr Andrushchenko's avatar Oleksandr Andrushchenko Committed by Daniel Vetter
Browse files

drm/tve200: Do not use deprecated drm_driver.{enable|disable)_vblank 



Do not use deprecated drm_driver.{enable|disable)_vblank callbacks,
but use drm_simple_kms_helpe's pipe callbacks instead.

Signed-off-by: default avatarOleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/1518425574-32671-4-git-send-email-andr2000@gmail.com
parent 989c48e6

drivers/gpu/drm/tve200/tve200_display.c

+8 −2
Original line number Diff line number Diff line
@@ -273,16 +273,20 @@ static void tve200_display_update(struct drm_simple_display_pipe *pipe, 
	}

}



int tve200_enable_vblank(struct drm_device *drm, unsigned int crtc)

static int tve200_display_enable_vblank(struct drm_simple_display_pipe *pipe)

{

	struct drm_crtc *crtc = &pipe->crtc;

	struct drm_device *drm = crtc->dev;

	struct tve200_drm_dev_private *priv = drm->dev_private;



	writel(TVE200_INT_V_STATUS, priv->regs + TVE200_INT_EN);

	return 0;

}



void tve200_disable_vblank(struct drm_device *drm, unsigned int crtc)

static void tve200_display_disable_vblank(struct drm_simple_display_pipe *pipe)

{

	struct drm_crtc *crtc = &pipe->crtc;

	struct drm_device *drm = crtc->dev;

	struct tve200_drm_dev_private *priv = drm->dev_private;



	writel(0, priv->regs + TVE200_INT_EN);
@@ -300,6 +304,8 @@ static const struct drm_simple_display_pipe_funcs tve200_display_funcs = { 
	.disable = tve200_display_disable,

	.update = tve200_display_update,

	.prepare_fb = tve200_display_prepare_fb,

	.enable_vblank = tve200_display_enable_vblank,

	.disable_vblank = tve200_display_disable_vblank,

};



int tve200_display_init(struct drm_device *drm)

drivers/gpu/drm/tve200/tve200_drm.h

+0 −2
Original line number Diff line number Diff line
@@ -113,8 +113,6 @@ struct tve200_drm_dev_private { 
	container_of(x, struct tve200_drm_connector, connector)



int tve200_display_init(struct drm_device *dev);

int tve200_enable_vblank(struct drm_device *drm, unsigned int crtc);

void tve200_disable_vblank(struct drm_device *drm, unsigned int crtc);

irqreturn_t tve200_irq(int irq, void *data);

int tve200_connector_init(struct drm_device *dev);

int tve200_encoder_init(struct drm_device *dev);

drivers/gpu/drm/tve200/tve200_drv.c

+0 −3
Original line number Diff line number Diff line
@@ -162,9 +162,6 @@ static struct drm_driver tve200_drm_driver = { 
	.gem_free_object_unlocked = drm_gem_cma_free_object,

	.gem_vm_ops = &drm_gem_cma_vm_ops,



	.enable_vblank = tve200_enable_vblank,

	.disable_vblank = tve200_disable_vblank,



	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,

	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,

	.gem_prime_import = drm_gem_prime_import,

CRA Git | Maintained and supported by SUSTech CRA and CCSE