The i915 connector initialization uses __drm_atomic_helper_connector_reset() to set up the initial state during connector allocation. However, it only needs to initialize the state, not reset it.
Switch to __drm_atomic_helper_connector_state_init() and assign connector->state explicitly, matching what atomic_create_state expects. Signed-off-by: Maxime Ripard <[email protected]> --- Cc: Jani Nikula <[email protected]> Cc: Joonas Lahtinen <[email protected]> Cc: Rodrigo Vivi <[email protected]> Cc: Tvrtko Ursulin <[email protected]> Cc: [email protected] Cc: [email protected] --- drivers/gpu/drm/i915/display/intel_connector.c | 6 ++++-- drivers/gpu/drm/i915/display/intel_sdvo.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c index 7ef9338d67ab..ed38959b466d 100644 --- a/drivers/gpu/drm/i915/display/intel_connector.c +++ b/drivers/gpu/drm/i915/display/intel_connector.c @@ -88,12 +88,14 @@ static int intel_connector_init(struct intel_connector *connector) */ conn_state = kzalloc_obj(*conn_state); if (!conn_state) return -ENOMEM; - __drm_atomic_helper_connector_reset(&connector->base, - &conn_state->base); + __drm_atomic_helper_connector_state_init(&conn_state->base, + &connector->base); + + connector->base.state = &conn_state->base; intel_panel_init_alloc(connector); INIT_WORK(&connector->modeset_retry_work, intel_connector_modeset_retry_work_fn); diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c index 3075ef04df56..7b97f531acbf 100644 --- a/drivers/gpu/drm/i915/display/intel_sdvo.c +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c @@ -2788,12 +2788,14 @@ static struct intel_sdvo_connector *intel_sdvo_connector_alloc(void) if (!conn_state) { kfree(sdvo_connector); return NULL; } - __drm_atomic_helper_connector_reset(&sdvo_connector->base.base, - &conn_state->base.base); + __drm_atomic_helper_connector_state_init(&conn_state->base.base, + &sdvo_connector->base.base); + + sdvo_connector->base.base.state = &conn_state->base.base; intel_panel_init_alloc(&sdvo_connector->base); return sdvo_connector; } -- 2.55.0
