Commit c8da8194 authored by Philippe CORNU's avatar Philippe CORNU Committed by Philippe Cornu

drm/stm: move enable/disable_vblank to crtc

enable/disable_vblank() functions at drm_driver level
are deprecated. Move them to the ltdc drm_crtc_funcs
structure.
Signed-off-by: default avatarPhilippe Cornu <philippe.cornu@st.com>
Reviewed-by: default avatarVincent Abriou <vincent.abriou@st.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180407212937.30407-1-philippe.cornu@st.com
parent 4394e964
...@@ -72,8 +72,6 @@ static struct drm_driver drv_driver = { ...@@ -72,8 +72,6 @@ static struct drm_driver drv_driver = {
.gem_prime_vmap = drm_gem_cma_prime_vmap, .gem_prime_vmap = drm_gem_cma_prime_vmap,
.gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_vunmap = drm_gem_cma_prime_vunmap,
.gem_prime_mmap = drm_gem_cma_prime_mmap, .gem_prime_mmap = drm_gem_cma_prime_mmap,
.enable_vblank = ltdc_crtc_enable_vblank,
.disable_vblank = ltdc_crtc_disable_vblank,
}; };
static int drv_load(struct drm_device *ddev) static int drv_load(struct drm_device *ddev)
......
...@@ -569,9 +569,9 @@ static const struct drm_crtc_helper_funcs ltdc_crtc_helper_funcs = { ...@@ -569,9 +569,9 @@ static const struct drm_crtc_helper_funcs ltdc_crtc_helper_funcs = {
.atomic_disable = ltdc_crtc_atomic_disable, .atomic_disable = ltdc_crtc_atomic_disable,
}; };
int ltdc_crtc_enable_vblank(struct drm_device *ddev, unsigned int pipe) static int ltdc_crtc_enable_vblank(struct drm_crtc *crtc)
{ {
struct ltdc_device *ldev = ddev->dev_private; struct ltdc_device *ldev = crtc_to_ltdc(crtc);
DRM_DEBUG_DRIVER("\n"); DRM_DEBUG_DRIVER("\n");
reg_set(ldev->regs, LTDC_IER, IER_LIE); reg_set(ldev->regs, LTDC_IER, IER_LIE);
...@@ -579,9 +579,9 @@ int ltdc_crtc_enable_vblank(struct drm_device *ddev, unsigned int pipe) ...@@ -579,9 +579,9 @@ int ltdc_crtc_enable_vblank(struct drm_device *ddev, unsigned int pipe)
return 0; return 0;
} }
void ltdc_crtc_disable_vblank(struct drm_device *ddev, unsigned int pipe) static void ltdc_crtc_disable_vblank(struct drm_crtc *crtc)
{ {
struct ltdc_device *ldev = ddev->dev_private; struct ltdc_device *ldev = crtc_to_ltdc(crtc);
DRM_DEBUG_DRIVER("\n"); DRM_DEBUG_DRIVER("\n");
reg_clear(ldev->regs, LTDC_IER, IER_LIE); reg_clear(ldev->regs, LTDC_IER, IER_LIE);
...@@ -594,6 +594,8 @@ static const struct drm_crtc_funcs ltdc_crtc_funcs = { ...@@ -594,6 +594,8 @@ static const struct drm_crtc_funcs ltdc_crtc_funcs = {
.reset = drm_atomic_helper_crtc_reset, .reset = drm_atomic_helper_crtc_reset,
.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
.enable_vblank = ltdc_crtc_enable_vblank,
.disable_vblank = ltdc_crtc_disable_vblank,
.gamma_set = drm_atomic_helper_legacy_gamma_set, .gamma_set = drm_atomic_helper_legacy_gamma_set,
}; };
......
...@@ -29,8 +29,6 @@ struct ltdc_device { ...@@ -29,8 +29,6 @@ struct ltdc_device {
u32 irq_status; u32 irq_status;
}; };
int ltdc_crtc_enable_vblank(struct drm_device *dev, unsigned int pipe);
void ltdc_crtc_disable_vblank(struct drm_device *dev, unsigned int pipe);
int ltdc_load(struct drm_device *ddev); int ltdc_load(struct drm_device *ddev);
void ltdc_unload(struct drm_device *ddev); void ltdc_unload(struct drm_device *ddev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment