The test HDMI connector reset implementation creates a pristine state and initializes the HDMI state. It does not perform any hardware reset.
Since this is equivalent to what atomic_create_state expects, convert the reset function to an atomic_create_state hook that returns the initialized state. Signed-off-by: Maxime Ripard <[email protected]> --- drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c index b2e347863a77..ae7b009052c2 100644 --- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c +++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c @@ -197,21 +197,30 @@ static const struct drm_connector_helper_funcs dummy_connector_helper_funcs = { .atomic_check = drm_atomic_helper_connector_hdmi_check, .get_modes = dummy_connector_get_modes, .mode_valid = drm_hdmi_connector_mode_valid, }; -static void dummy_hdmi_connector_reset(struct drm_connector *connector) +static struct drm_connector_state * +dummy_hdmi_connector_create_state(struct drm_connector *connector) { - drm_atomic_helper_connector_reset(connector); - __drm_atomic_helper_connector_hdmi_state_init(connector, connector->state); + struct drm_connector_state *connector_state; + + connector_state = drm_atomic_helper_connector_create_state(connector); + if (IS_ERR(connector_state)) + return connector_state; + + __drm_atomic_helper_connector_hdmi_state_init(connector, + connector_state); + + return connector_state; } static const struct drm_connector_funcs dummy_connector_funcs = { .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, .fill_modes = drm_helper_probe_single_connector_modes, - .reset = dummy_hdmi_connector_reset, + .atomic_create_state = dummy_hdmi_connector_create_state, }; static void test_encoder_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_commit *state) { -- 2.55.0
