The tests 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]>
---
 drivers/gpu/drm/tests/drm_atomic_commit_test.c | 2 +-
 drivers/gpu/drm/tests/drm_atomic_test.c        | 2 +-
 drivers/gpu/drm/tests/drm_connector_test.c     | 4 ++--
 drivers/gpu/drm/tests/drm_probe_helper_test.c  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/tests/drm_atomic_commit_test.c 
b/drivers/gpu/drm/tests/drm_atomic_commit_test.c
index ff69bade19b8..1121246dbb9f 100644
--- a/drivers/gpu/drm/tests/drm_atomic_commit_test.c
+++ b/drivers/gpu/drm/tests/drm_atomic_commit_test.c
@@ -51,11 +51,11 @@ static const struct drm_encoder_helper_funcs 
drm_atomic_test_encoder_funcs = {
 };
 
 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,
-       .reset                  = drm_atomic_helper_connector_reset,
+       .atomic_create_state = drm_atomic_helper_connector_create_state,
 };
 
 static int drm_atomic_test_dummy_get_modes(struct drm_connector *connector)
 {
        return drm_connector_helper_get_modes_fixed(connector,
diff --git a/drivers/gpu/drm/tests/drm_atomic_test.c 
b/drivers/gpu/drm/tests/drm_atomic_test.c
index ea91bec6569e..e9f8f4fbdc4b 100644
--- a/drivers/gpu/drm/tests/drm_atomic_test.c
+++ b/drivers/gpu/drm/tests/drm_atomic_test.c
@@ -23,11 +23,11 @@ static const struct drm_connector_helper_funcs 
drm_atomic_init_connector_helper_
 };
 
 static const struct drm_connector_funcs drm_atomic_init_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,
 };
 
 static struct drm_atomic_test_priv *create_device(struct kunit *test)
 {
        struct drm_atomic_test_priv *priv;
diff --git a/drivers/gpu/drm/tests/drm_connector_test.c 
b/drivers/gpu/drm/tests/drm_connector_test.c
index 3368aedd4e66..0d8d3462d024 100644
--- a/drivers/gpu/drm/tests/drm_connector_test.c
+++ b/drivers/gpu/drm/tests/drm_connector_test.c
@@ -48,11 +48,11 @@ static const struct drm_connector_hdmi_funcs 
dummy_hdmi_funcs = {
 };
 
 static const struct drm_connector_funcs dummy_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,
 };
 
 static int dummy_ddc_xfer(struct i2c_adapter *adapter,
                          struct i2c_msg *msgs, int num)
 {
@@ -202,11 +202,11 @@ static struct kunit_suite drmm_connector_init_test_suite 
= {
 };
 
 static const struct drm_connector_funcs dummy_dynamic_init_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,
        .destroy                = drm_connector_cleanup,
 };
 
 /*
  * Test that the initialization of a bog standard dynamic connector works
diff --git a/drivers/gpu/drm/tests/drm_probe_helper_test.c 
b/drivers/gpu/drm/tests/drm_probe_helper_test.c
index db0e4f5df275..38485d42dddb 100644
--- a/drivers/gpu/drm/tests/drm_probe_helper_test.c
+++ b/drivers/gpu/drm/tests/drm_probe_helper_test.c
@@ -25,11 +25,11 @@ static const struct drm_connector_helper_funcs 
drm_probe_helper_connector_helper
 };
 
 static const struct drm_connector_funcs drm_probe_helper_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,
 };
 
 static int drm_probe_helper_test_init(struct kunit *test)
 {
        struct drm_probe_helper_test_priv *priv;

-- 
2.55.0

Reply via email to