On 11/28/22 11:53, Maxime Ripard wrote:

The name doesn't really fit the conventions for the other helpers in DRM/KMS, so let's rename it to make it obvious that we allocate a new DRM device.

Signed-off-by: Maxime Ripard maxime@cerno.tech

Reviewed-by: Maíra Canal mcanal@igalia.com

Best Regards, - Maíra Canal

---

drivers/gpu/drm/tests/drm_client_modeset_test.c | 3 ++- drivers/gpu/drm/tests/drm_kunit_helpers.c | 8 +++++--- drivers/gpu/drm/tests/drm_modes_test.c | 3 ++- drivers/gpu/drm/tests/drm_probe_helper_test.c | 5 +++-- include/drm/drm_kunit_helpers.h | 5 ++++- 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/tests/drm_client_modeset_test.c b/drivers/gpu/drm/tests/drm_client_modeset_test.c index ed2f62e92fea..6cdf08f582ce 100644 --- a/drivers/gpu/drm/tests/drm_client_modeset_test.c +++ b/drivers/gpu/drm/tests/drm_client_modeset_test.c @@ -59,7 +59,8 @@ static int drm_client_modeset_test_init(struct kunit *test) test->priv = priv;

• priv->drm = drm_kunit_device_init(test, DRIVER_MODESET, "drm-client-modeset-test");

• priv->drm = drm_kunit_helper_alloc_drm_device(test, DRIVER_MODESET,

• 				      "drm-client-modeset-test");
  

  KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->drm);

ret = drmm_connector_init(priv->drm, &priv->connector, diff --git a/drivers/gpu/drm/tests/drm_kunit_helpers.c b/drivers/gpu/drm/tests/drm_kunit_helpers.c index 46a68c2fd80c..2f67f6cf78d0 100644 --- a/drivers/gpu/drm/tests/drm_kunit_helpers.c +++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c @@ -36,7 +36,7 @@ static void dev_free(struct kunit_resource *res) } /**

• • drm_kunit_device_init - Allocates a mock DRM device for Kunit tests

• • drm_kunit_helper_alloc_drm_device - Allocates a mock DRM device for Kunit tests
  • @test: The test context object
  • @features: Mocked DRM device driver features
  • @name: Name of the struct &device to allocate

@@ -52,7 +52,9 @@ static void dev_free(struct kunit_resource *res)

• Returns:
• A pointer to the new drm_device, or an ERR_PTR() otherwise.

*/ -struct drm_device *drm_kunit_device_init(struct kunit *test, u32 features, char *name) +struct drm_device * +drm_kunit_helper_alloc_drm_device(struct kunit *test,

• 		  u32 features, char *name)
  

{ struct kunit_dev *kdev; struct drm_device *drm; @@ -82,7 +84,7 @@ struct drm_device *drm_kunit_device_init(struct kunit *test, u32 features, char return drm; } -EXPORT_SYMBOL(drm_kunit_device_init); +EXPORT_SYMBOL(drm_kunit_helper_alloc_drm_device); MODULE_AUTHOR("Maxime Ripard maxime@cerno.tech"); MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/tests/drm_modes_test.c b/drivers/gpu/drm/tests/drm_modes_test.c index 3953e478c4d0..6723089dff9f 100644 --- a/drivers/gpu/drm/tests/drm_modes_test.c +++ b/drivers/gpu/drm/tests/drm_modes_test.c @@ -22,7 +22,8 @@ static int drm_test_modes_init(struct kunit *test) priv = kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL); KUNIT_ASSERT_NOT_NULL(test, priv);

• priv->drm = drm_kunit_device_init(test, DRIVER_MODESET, "drm-modes-test");

• priv->drm = drm_kunit_helper_alloc_drm_device(test, DRIVER_MODESET,

• 				      "drm-modes-test");
  

  KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->drm);

test->priv = priv; diff --git a/drivers/gpu/drm/tests/drm_probe_helper_test.c b/drivers/gpu/drm/tests/drm_probe_helper_test.c index 1f3941c150ae..85236ff4744f 100644 --- a/drivers/gpu/drm/tests/drm_probe_helper_test.c +++ b/drivers/gpu/drm/tests/drm_probe_helper_test.c @@ -39,8 +39,9 @@ static int drm_probe_helper_test_init(struct kunit *test) KUNIT_ASSERT_NOT_NULL(test, priv); test->priv = priv;

• priv->drm = drm_kunit_device_init(test, DRIVER_MODESET | DRIVER_ATOMIC,

• 			  "drm-probe-helper-test");
  

• priv->drm = drm_kunit_helper_alloc_drm_device(test,

• 				      DRIVER_MODESET | DRIVER_ATOMIC,
  

• 				      "drm-probe-helper-test");
  

  KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->drm);

connector = &priv->connector; diff --git a/include/drm/drm_kunit_helpers.h b/include/drm/drm_kunit_helpers.h index 20ab6eec4c89..e9870c7911fe 100644 --- a/include/drm/drm_kunit_helpers.h +++ b/include/drm/drm_kunit_helpers.h @@ -6,6 +6,9 @@ struct drm_device; struct kunit; -struct drm_device *drm_kunit_device_init(struct kunit *test, u32 features, char *name); +struct drm_device * +drm_kunit_helper_alloc_drm_device(struct kunit *test,

• 		  u32 features,
  

• 		  char *name);
  

#endif // DRM_KUNIT_HELPERS_H_