All users of drm_atomic_helper_crtc_reset() have been converted to drm_atomic_helper_crtc_create_state().
Remove the now unused helper. Signed-off-by: Maxime Ripard <[email protected]> --- drivers/gpu/drm/drm_atomic_state_helper.c | 19 ------------------- include/drm/drm_atomic_state_helper.h | 1 - include/drm/drm_crtc.h | 2 -- 3 files changed, 22 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c index d90d1d7c9cf9..b592b7f5f264 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -103,29 +103,10 @@ __drm_atomic_helper_crtc_reset(struct drm_crtc *crtc, crtc->state = crtc_state; } EXPORT_SYMBOL(__drm_atomic_helper_crtc_reset); -/** - * drm_atomic_helper_crtc_reset - default &drm_crtc_funcs.reset hook for CRTCs - * @crtc: drm CRTC - * - * Resets the atomic state for @crtc by freeing the state pointer (which might - * be NULL, e.g. at driver load time) and allocating a new empty state object. - */ -void drm_atomic_helper_crtc_reset(struct drm_crtc *crtc) -{ - struct drm_crtc_state *crtc_state = - kzalloc_obj(*crtc->state); - - if (crtc->state) - crtc->funcs->atomic_destroy_state(crtc, crtc->state); - - __drm_atomic_helper_crtc_reset(crtc, crtc_state); -} -EXPORT_SYMBOL(drm_atomic_helper_crtc_reset); - /** * drm_atomic_helper_crtc_create_state - default &drm_crtc_funcs.atomic_create_state hook for crtcs * @crtc: crtc object * * Allocates and initializes pristine @drm_crtc_state. diff --git a/include/drm/drm_atomic_state_helper.h b/include/drm/drm_atomic_state_helper.h index 34a599c3d86d..df70817c94fc 100644 --- a/include/drm/drm_atomic_state_helper.h +++ b/include/drm/drm_atomic_state_helper.h @@ -42,11 +42,10 @@ struct drm_device; void __drm_atomic_helper_crtc_state_init(struct drm_crtc_state *state, struct drm_crtc *crtc); void __drm_atomic_helper_crtc_reset(struct drm_crtc *crtc, struct drm_crtc_state *state); -void drm_atomic_helper_crtc_reset(struct drm_crtc *crtc); struct drm_crtc_state * drm_atomic_helper_crtc_create_state(struct drm_crtc *crtc); void __drm_atomic_helper_crtc_duplicate_state(struct drm_crtc *crtc, struct drm_crtc_state *state); struct drm_crtc_state * diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 152349f973e3..12f43253f059 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -428,12 +428,10 @@ struct drm_crtc_funcs { * * Reset CRTC hardware and software state to off. This function isn't * called by the core directly, only through drm_mode_config_reset(). * It's not a helper hook only for historical reasons. * - * Atomic drivers can use drm_atomic_helper_crtc_reset() to reset - * atomic state using this hook. */ void (*reset)(struct drm_crtc *crtc); /** * @cursor_set: -- 2.55.0
