drm/vc4: tests: Convert to plane creation helper

Now that we have a plane create helper for kunit mocked drivers, let's
convert to it in vc4.

Reviewed-by: Maíra Canal <mcanal@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240527-kms-hdmi-connector-state-v15-27-c5af16c3aae2@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>

diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c b/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
index 973f5f929097526967ae12c83b2051c6c3c0ef8e..14357db82238be6062e23a47e44142d7f77a9b19 100644 (file)
--- a/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
+++ b/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
@@ -1,43 +1,25 @@
 // SPDX-License-Identifier: GPL-2.0
 
-#include <drm/drm_atomic_state_helper.h>
-#include <drm/drm_fourcc.h>
-#include <drm/drm_modeset_helper_vtables.h>
+#include <drm/drm_kunit_helpers.h>
 #include <drm/drm_plane.h>
 
 #include <kunit/test.h>
 
 #include "vc4_mock.h"
 
-static const struct drm_plane_helper_funcs vc4_dummy_plane_helper_funcs = {
-};
-
-static const struct drm_plane_funcs vc4_dummy_plane_funcs = {
-       .atomic_destroy_state   = drm_atomic_helper_plane_destroy_state,
-       .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
-       .reset                  = drm_atomic_helper_plane_reset,
-};
-
-static const uint32_t vc4_dummy_plane_formats[] = {
-       DRM_FORMAT_XRGB8888,
-};
-
 struct drm_plane *vc4_dummy_plane(struct kunit *test, struct drm_device *drm,
                                  enum drm_plane_type type)
 {
        struct drm_plane *plane;
 
-       plane = __drmm_universal_plane_alloc(drm, sizeof(struct drm_plane), 0,
-                                                0,
-                                                &vc4_dummy_plane_funcs,
-                                                vc4_dummy_plane_formats,
-                                                ARRAY_SIZE(vc4_dummy_plane_formats),
-                                                NULL,
-                                                DRM_PLANE_TYPE_PRIMARY,
-                                                NULL);
-       KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane);
+       KUNIT_ASSERT_EQ(test, type, DRM_PLANE_TYPE_PRIMARY);
 
-       drm_plane_helper_add(plane, &vc4_dummy_plane_helper_funcs);
+       plane = drm_kunit_helper_create_primary_plane(test, drm,
+                                                     NULL,
+                                                     NULL,
+                                                     NULL, 0,
+                                                     NULL);
+       KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane);
 
        return plane;
 }