Commit 87b09c62 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/sti: Convert to CRTC VBLANK callbacks 



VBLANK callbacks in struct drm_driver are deprecated in favor of
their equivalents in struct drm_crtc_funcs. Convert sti over.

v2:
	* remove unnecessary include of sti_crtc.h from sti_drv.c

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarBenjamin Gaignard <benjamin.gaignard@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200123135943.24140-17-tzimmermann@suse.de
parent 9661510e

drivers/gpu/drm/sti/sti_crtc.c

+8 −3
Original line number Diff line number Diff line
@@ -279,12 +279,13 @@ int sti_crtc_vblank_cb(struct notifier_block *nb, 
	return 0;

}



int sti_crtc_enable_vblank(struct drm_device *dev, unsigned int pipe)

static int sti_crtc_enable_vblank(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	unsigned int pipe = crtc->index;

	struct sti_private *dev_priv = dev->dev_private;

	struct sti_compositor *compo = dev_priv->compo;

	struct notifier_block *vtg_vblank_nb = &compo->vtg_vblank_nb[pipe];

	struct drm_crtc *crtc = &compo->mixer[pipe]->drm_crtc;

	struct sti_vtg *vtg = compo->vtg[pipe];



	DRM_DEBUG_DRIVER("\n");
@@ -297,8 +298,10 @@ int sti_crtc_enable_vblank(struct drm_device *dev, unsigned int pipe) 
	return 0;

}



void sti_crtc_disable_vblank(struct drm_device *drm_dev, unsigned int pipe)

static void sti_crtc_disable_vblank(struct drm_crtc *crtc)

{

	struct drm_device *drm_dev = crtc->dev;

	unsigned int pipe = crtc->index;

	struct sti_private *priv = drm_dev->dev_private;

	struct sti_compositor *compo = priv->compo;

	struct notifier_block *vtg_vblank_nb = &compo->vtg_vblank_nb[pipe];
@@ -330,6 +333,8 @@ static const struct drm_crtc_funcs sti_crtc_funcs = { 
	.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,

	.late_register = sti_crtc_late_register,

	.enable_vblank = sti_crtc_enable_vblank,

	.disable_vblank = sti_crtc_disable_vblank,

};



bool sti_crtc_is_main(struct drm_crtc *crtc)

drivers/gpu/drm/sti/sti_crtc.h

+0 −2
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ struct sti_mixer; 


int sti_crtc_init(struct drm_device *drm_dev, struct sti_mixer *mixer,

		  struct drm_plane *primary, struct drm_plane *cursor);

int sti_crtc_enable_vblank(struct drm_device *dev, unsigned int pipe);

void sti_crtc_disable_vblank(struct drm_device *dev, unsigned int pipe);

int sti_crtc_vblank_cb(struct notifier_block *nb,

		       unsigned long event, void *data);

bool sti_crtc_is_main(struct drm_crtc *drm_crtc);

drivers/gpu/drm/sti/sti_drv.c

+0 −4
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <drm/drm_of.h>

#include <drm/drm_probe_helper.h>



#include "sti_crtc.h"

#include "sti_drv.h"

#include "sti_plane.h"
@@ -146,9 +145,6 @@ static struct drm_driver sti_driver = { 
	.dumb_create = drm_gem_cma_dumb_create,

	.fops = &sti_driver_fops,



	.enable_vblank = sti_crtc_enable_vblank,

	.disable_vblank = sti_crtc_disable_vblank,



	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,

	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,

	.gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,

CRA Git | Maintained and supported by SUSTech CRA and CCSE