On 2026-10-14 13:26, Maxime Ripard wrote:
> The amdgpu: dm connector implementation uses the deprecated
> drm_atomic_helper_connector_reset() as its reset hook.
>
> Switch to drm_atomic_helper_connector_create_state() instead.
>
> Signed-off-by: Maxime Ripard <[email protected]>
Reviewed-by: Leo Li <[email protected]>
> ---
> Cc: "Christian König" <[email protected]>
> Cc: Alex Deucher <[email protected]>
> Cc: Harry Wentland <[email protected]>
> Cc: Leo Li <[email protected]>
> Cc: Rodrigo Siqueira <[email protected]>
> Cc: [email protected]
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_audio_test.c | 2 +-
> .../gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c | 2 +-
> drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crc_test.c | 7
> ++++---
> .../gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_helpers_test.c | 2 +-
> drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_irq_test.c | 2 +-
> .../gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_mst_types_test.c | 4 ++--
> drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_wb_test.c | 2 +-
> 7 files changed, 11 insertions(+), 10 deletions(-)
>
> diff --git
> a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_audio_test.c
> b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_audio_test.c
> index 040a7a9c0335..9d83b7b1ca80 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_audio_test.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_audio_test.c
> @@ -25,11 +25,11 @@
> #include "amdgpu_dm.h"
> #include "amdgpu_dm_audio.h"
> #include "amdgpu_dm_kunit_test_helpers.h"
>
> static const struct drm_connector_funcs dm_test_audio_connector_funcs = {
> - .reset = drm_atomic_helper_connector_reset,
> + .atomic_create_state = drm_atomic_helper_connector_create_state,
> .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = drm_connector_cleanup,
> };
> diff --git
> a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c
> b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c
> index 5221050dec2f..6e9ee3c93943 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c
> @@ -30,11 +30,11 @@ struct dm_backlight_connector_fixture {
> struct amdgpu_dm_connector *aconnector;
> struct dc_link *link;
> };
>
> static const struct drm_connector_funcs dm_backlight_test_connector_funcs = {
> - .reset = drm_atomic_helper_connector_reset,
> + .atomic_create_state = drm_atomic_helper_connector_create_state,
> .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> };
>
> static void setup_test_connector(struct kunit *test,
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crc_test.c
> b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crc_test.c
> index 29a513dab9cd..e47b4dd210b8 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crc_test.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crc_test.c
> @@ -173,11 +173,11 @@ static struct amdgpu_crtc
> *dm_test_alloc_crc_crtc(struct kunit *test,
>
> return acrtc;
> }
>
> static const struct drm_connector_funcs dm_test_crc_connector_funcs = {
> - .reset = drm_atomic_helper_connector_reset,
> + .atomic_create_state = drm_atomic_helper_connector_create_state,
> .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = drm_connector_cleanup,
> };
> @@ -652,12 +652,13 @@ static void
> dm_test_crtc_set_crc_source_dprx_no_connector(struct kunit *test)
> KUNIT_ASSERT_EQ(test, drm_connector_init(&adev->ddev, wb_conn,
> &dm_test_crc_connector_funcs,
> DRM_MODE_CONNECTOR_WRITEBACK),
> 0);
> KUNIT_ASSERT_EQ(test, kunit_add_action_or_reset(test,
> dm_test_crc_connector_cleanup, wb_conn), 0);
> - drm_atomic_helper_connector_reset(wb_conn);
> - KUNIT_ASSERT_NOT_NULL(test, wb_conn->state);
> +
> + wb_conn->state = drm_atomic_helper_connector_create_state(wb_conn);
> + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, wb_conn->state);
> wb_conn->state->crtc = &acrtc->base;
> /*
> * __drm_atomic_helper_connector_destroy_state() drops a connector
> * reference when state->crtc is set. Balance it here since the CRTC is
> * assigned directly rather than via
> drm_atomic_set_crtc_for_connector(),
> diff --git
> a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_helpers_test.c
> b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_helpers_test.c
> index 51c3995de76d..a369a3cbd4af 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_helpers_test.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_helpers_test.c
> @@ -4104,11 +4104,11 @@ static void
> dm_test_is_dp_sink_present_queries_link_service(struct kunit *test)
> * drm_edid_connector_update(), which needs a fully initialised connector so
> the
> * EDID property blob is published. dm_kunit_alloc_connector() only fills in
> the
> * device pointer, so build a real one here.
> */
> static const struct drm_connector_funcs dm_test_connector_funcs = {
> - .reset = drm_atomic_helper_connector_reset,
> + .atomic_create_state = drm_atomic_helper_connector_create_state,
> };
>
> static struct amdgpu_dm_connector *dm_test_alloc_real_connector(struct kunit
> *test,
> struct
> amdgpu_device *adev)
> {
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_irq_test.c
> b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_irq_test.c
> index dc7d94f75ff4..3265b50abb46 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_irq_test.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_irq_test.c
> @@ -479,11 +479,11 @@ static void dm_test_destroy_hpd_rx_wq(void *data)
> destroy_workqueue(ctx->wq[i].wq);
> kfree(ctx->wq);
> }
>
> static const struct drm_connector_funcs dm_test_connector_funcs = {
> - .reset = drm_atomic_helper_connector_reset,
> + .atomic_create_state = drm_atomic_helper_connector_create_state,
> .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = drm_connector_cleanup,
> };
> diff --git
> a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_mst_types_test.c
> b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_mst_types_test.c
> index 382eafab2d43..10a213c36af4 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_mst_types_test.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_mst_types_test.c
> @@ -1160,11 +1160,11 @@ static bool dm_mst_test_dp_get_max_link_enc_cap(const
> struct dc_link *link,
> static void dm_mst_test_connector_destroy(struct drm_connector *connector)
> {
> }
>
> static const struct drm_connector_funcs dm_mst_test_connector_funcs = {
> - .reset = drm_atomic_helper_connector_reset,
> + .atomic_create_state = drm_atomic_helper_connector_create_state,
> .destroy = dm_mst_test_connector_destroy,
> .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> };
>
> @@ -3698,11 +3698,11 @@ static void
> dm_mst_test_pre_compute_configs_no_recompute(struct kunit *test)
> }
>
> /* Tests for compute_mst_dsc_configs_for_link */
>
> static const struct drm_connector_funcs dm_mst_test_dsc_link_conn_funcs = {
> - .reset = drm_atomic_helper_connector_reset,
> + .atomic_create_state = drm_atomic_helper_connector_create_state,
> .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> };
>
> static enum dp_link_encoding dm_mst_test_mst_encoding_format(const struct
> dc_link *link)
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_wb_test.c
> b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_wb_test.c
> index 03036f906385..e1e7d4c29966 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_wb_test.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_wb_test.c
> @@ -385,11 +385,11 @@ static void
> dm_test_wb_atomic_check_invalid_format(struct kunit *test)
> /* Tests for amdgpu_dm_wb_connector_get_modes using DRM mock */
>
> static const struct drm_connector_funcs dm_wb_test_connector_funcs = {
> .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> - .reset = drm_atomic_helper_connector_reset,
> + .atomic_create_state = drm_atomic_helper_connector_create_state,
> };
>
> /**
> * dm_test_wb_get_modes_returns_modes - Verify at least one mode is returned
> * @test: KUnit test context
>
