drm/stm: move enable/disable_vblank to crtc
Subsystems (4)
PATCH 1/1 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.
--- drivers/gpu/drm/stm/drv.c | 2 -- drivers/gpu/drm/stm/ltdc.c | 10 ++++++---- drivers/gpu/drm/stm/ltdc.h | 2 -- 3 files changed, 6 insertions(+), 8 deletions(-)
drivers/gpu/drm/stm/drv.c +0 -2
@@ -72,8 +72,6 @@ static struct drm_driver drv_driver = { .gem_prime_vmap = drm_gem_cma_prime_vmap, .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .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)
drivers/gpu/drm/stm/ltdc.c +6 -4
@@ -569,9 +569,9 @@ static const struct drm_crtc_helper_funcs ltdc_crtc_helper_funcs = { .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" );reg_set (ldev->regs,LTDC_IER ,IER_LIE );
@@ -579,9 +579,9 @@ int ltdc_crtc_enable_vblank(struct drm_device *ddev, unsigned int pipe)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" );reg_clear (ldev->regs,LTDC_IER ,IER_LIE );
@@ -594,6 +594,8 @@ static const struct drm_crtc_funcs ltdc_crtc_funcs = { .reset = drm_atomic_helper_crtc_reset, .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_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, };
drivers/gpu/drm/stm/ltdc.h +0 -2
@@ -29,8 +29,6 @@ struct ltdc_device {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);void ltdc_unload (struct drm_device *ddev);
Signature · 6 lines
2.15.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Philippe,
Patch looks good to me.
Quoted 67 lines · Philippe Cornu
enable/disable_vblank() functions at
drm_driverlevel are deprecated. Move them to the ltdcdrm_crtc_funcsstructure.Signed-off-by Philippe Cornu <[email protected]>--- drivers/gpu/drm/stm/drv.c | 2 -- drivers/gpu/drm/stm/ltdc.c | 10 ++++++---- drivers/gpu/drm/stm/ltdc.h | 2 -- 3 files changed, 6 insertions(+), 8 deletions(-)drivers/gpu/drm/stm/drv.c +0
-2@@ -72,8 +72,6 @@ static struct drm_driver drv_driver = { .gem_prime_vmap = drm_gem_cma_prime_vmap, .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .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)drivers/gpu/drm/stm/ltdc.c +6
-4@@ -569,9 +569,9 @@ static const struct drm_crtc_helper_funcs ltdc_crtc_helper_funcs = { .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" );reg_set (ldev->regs,LTDC_IER ,IER_LIE );@@ -579,9 +579,9 @@ int ltdc_crtc_enable_vblank(struct drm_device *ddev, unsigned int pipe)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" );reg_clear (ldev->regs,LTDC_IER ,IER_LIE );@@ -594,6 +594,8 @@ static const struct drm_crtc_funcs ltdc_crtc_funcs = { .reset = drm_atomic_helper_crtc_reset, .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_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, };drivers/gpu/drm/stm/ltdc.h +0
-0
drivers/gpu/drm/stm/ltdc.h struct ltdc_device { · line 34
Quoted 8 lines
drivers/gpu/drm/stm/ltdc.h +0
-2@@ -29,8 +29,6 @@ struct ltdc_device {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);void ltdc_unload (struct drm_device *ddev);
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Applied on drm-misc-next.
Many thanks,
Philippe :-)
Quoted 76 lines · Vincent ABRIOU
Hi Philippe,
Patch looks good to me.
Reviewed-by Vincent Abriou <[email protected]>Quoted 69 lines · Philippe Cornu
enable/disable_vblank() functions at
drm_driverlevel are deprecated. Move them to the ltdcdrm_crtc_funcsstructure.Signed-off-by Philippe Cornu <[email protected]>--- drivers/gpu/drm/stm/drv.c | 2 -- drivers/gpu/drm/stm/ltdc.c | 10 ++++++---- drivers/gpu/drm/stm/ltdc.h | 2 -- 3 files changed, 6 insertions(+), 8 deletions(-)drivers/gpu/drm/stm/drv.c +0
-2@@ -72,8 +72,6 @@ static struct drm_driver drv_driver = { .gem_prime_vmap = drm_gem_cma_prime_vmap, .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .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)drivers/gpu/drm/stm/ltdc.c +6
-4@@ -569,9 +569,9 @@ static const struct drm_crtc_helper_funcs ltdc_crtc_helper_funcs = { .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" );reg_set (ldev->regs,LTDC_IER ,IER_LIE );@@ -579,9 +579,9 @@ int ltdc_crtc_enable_vblank(struct drm_device *ddev, unsigned int pipe)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" );reg_clear (ldev->regs,LTDC_IER ,IER_LIE );@@ -594,6 +594,8 @@ static const struct drm_crtc_funcs ltdc_crtc_funcs = { .reset = drm_atomic_helper_crtc_reset, .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_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, };drivers/gpu/drm/stm/ltdc.h +0
-0@@ -29,8 +29,6 @@ struct ltdc_device {u32 irq_status; };
Quoted 5 lines
drivers/gpu/drm/stm/ltdc.h struct ltdc_device { · line 34
Quoted 5 lines
drivers/gpu/drm/stm/ltdc.h +0
-2-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);void ltdc_unload (struct drm_device *ddev);
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel