All drivers implementing the connector reset hook using __drm_atomic_helper_connector_reset() have been converted to atomic_create_state.
Remove __drm_atomic_helper_connector_reset(). Signed-off-by: Maxime Ripard <[email protected]> --- drivers/gpu/drm/drm_atomic_state_helper.c | 23 ----------------------- include/drm/drm_atomic_state_helper.h | 2 -- include/drm/drm_connector.h | 3 --- 3 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 8c48031956fe..efe173f3eeca 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -410,33 +410,10 @@ __drm_atomic_helper_connector_state_init(struct drm_connector_state *conn_state, { conn_state->connector = connector; } EXPORT_SYMBOL(__drm_atomic_helper_connector_state_init); -/** - * __drm_atomic_helper_connector_reset - reset state on connector - * @connector: drm connector - * @conn_state: connector state to assign - * - * Initializes the newly allocated @conn_state and assigns it to - * the &drm_connector->state pointer of @connector, usually required when - * initializing the drivers or when called from the &drm_connector_funcs.reset - * hook. - * - * This is useful for drivers that subclass the connector state. - */ -void -__drm_atomic_helper_connector_reset(struct drm_connector *connector, - struct drm_connector_state *conn_state) -{ - if (conn_state) - __drm_atomic_helper_connector_state_init(conn_state, connector); - - connector->state = conn_state; -} -EXPORT_SYMBOL(__drm_atomic_helper_connector_reset); - /** * drm_atomic_helper_connector_create_state - default &drm_connector_funcs.atomic_create_state hook for connectors * @connector: connector object * * Allocates and initializes pristine @drm_connector_state. diff --git a/include/drm/drm_atomic_state_helper.h b/include/drm/drm_atomic_state_helper.h index 7bced7e9d860..1a822179f2ec 100644 --- a/include/drm/drm_atomic_state_helper.h +++ b/include/drm/drm_atomic_state_helper.h @@ -64,12 +64,10 @@ void __drm_atomic_helper_plane_destroy_state(struct drm_plane_state *state); void drm_atomic_helper_plane_destroy_state(struct drm_plane *plane, struct drm_plane_state *state); void __drm_atomic_helper_connector_state_init(struct drm_connector_state *conn_state, struct drm_connector *connector); -void __drm_atomic_helper_connector_reset(struct drm_connector *connector, - struct drm_connector_state *conn_state); struct drm_connector_state * drm_atomic_helper_connector_create_state(struct drm_connector *connector); void drm_atomic_helper_connector_tv_state_init(struct drm_connector_state *state, struct drm_connector *connector); int drm_atomic_helper_connector_tv_check(struct drm_connector *connector, diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 8b52360339e0..a87cd13d0a45 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1662,13 +1662,10 @@ struct drm_connector_funcs { * @reset: * * Reset connector 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_connector_reset() to reset - * atomic state using this hook. */ void (*reset)(struct drm_connector *connector); /** * @detect: -- 2.55.0
