All users of __drm_atomic_helper_crtc_reset() have been converted to use drm_atomic_helper_crtc_state_init() and atomic_create_state.
Remove the now unused helper. Signed-off-by: Maxime Ripard <[email protected]> --- drivers/gpu/drm/drm_atomic_state_helper.c | 26 -------------------------- include/drm/drm_atomic_state_helper.h | 2 -- 2 files changed, 28 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c index b592b7f5f264..354fa9c6aca8 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -77,36 +77,10 @@ __drm_atomic_helper_crtc_state_init(struct drm_crtc_state *crtc_state, crtc_state->crtc = crtc; crtc_state->background_color = DRM_ARGB64_PREP(0xffff, 0, 0, 0); } EXPORT_SYMBOL(__drm_atomic_helper_crtc_state_init); -/** - * __drm_atomic_helper_crtc_reset - reset state on CRTC - * @crtc: drm CRTC - * @crtc_state: CRTC state to assign - * - * Initializes the newly allocated @crtc_state and assigns it to - * the &drm_crtc->state pointer of @crtc, usually required when - * initializing the drivers or when called from the &drm_crtc_funcs.reset - * hook. - * - * This is useful for drivers that subclass the CRTC state. - */ -void -__drm_atomic_helper_crtc_reset(struct drm_crtc *crtc, - struct drm_crtc_state *crtc_state) -{ - if (crtc_state) - __drm_atomic_helper_crtc_state_init(crtc_state, crtc); - - if (drm_dev_has_vblank(crtc->dev)) - drm_crtc_vblank_reset(crtc); - - crtc->state = 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 df70817c94fc..480eaae42f45 100644 --- a/include/drm/drm_atomic_state_helper.h +++ b/include/drm/drm_atomic_state_helper.h @@ -40,12 +40,10 @@ struct drm_private_state; struct drm_modeset_acquire_ctx; 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); 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 * -- 2.55.0
