drm/vc4: tests: Remove vc4_dummy_plane structure

The vc4_dummy_plane structure was introduced as a mean to add
mock-specific fields.

However, we never really used it and it's still strictly equivalent to
vc4_plane (which is in the same situation vs drm_plane), so we can
simply remove the vc4_dummy_plane structure and make the mock code
cleaner.

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

diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock.c b/drivers/gpu/drm/vc4/tests/vc4_mock.c
index becb3dbaa548e247868c965ee08243b395ab30ba..0731a7d85d7abc205b7e42637beda993c890ff67 100644 (file)
--- a/drivers/gpu/drm/vc4/tests/vc4_mock.c
+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.c
@@ -109,16 +109,14 @@ static const struct vc4_mock_desc vc5_mock =
 static int __build_one_pipe(struct kunit *test, struct drm_device *drm,
                            const struct vc4_mock_pipe_desc *pipe)
 {
-       struct vc4_dummy_plane *dummy_plane;
        struct drm_plane *plane;
        struct vc4_dummy_crtc *dummy_crtc;
        struct drm_crtc *crtc;
        unsigned int i;
 
-       dummy_plane = vc4_dummy_plane(test, drm, DRM_PLANE_TYPE_PRIMARY);
-       KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dummy_plane);
+       plane = vc4_dummy_plane(test, drm, DRM_PLANE_TYPE_PRIMARY);
+       KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane);
 
-       plane = &dummy_plane->plane.base;
        dummy_crtc = vc4_mock_pv(test, drm, plane, pipe->data);
        KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dummy_crtc);
 

diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock.h b/drivers/gpu/drm/vc4/tests/vc4_mock.h
index 2d0b339bd9f39dfd4b64bbd186fa1cf937c6e796..002b6218960c48dae102cafd4120f9713b89cb50 100644 (file)
--- a/drivers/gpu/drm/vc4/tests/vc4_mock.h
+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.h
@@ -21,13 +21,8 @@ struct drm_crtc *vc4_find_crtc_for_encoder(struct kunit *test,
        return NULL;
 }
 
-struct vc4_dummy_plane {
-       struct vc4_plane plane;
-};
-
-struct vc4_dummy_plane *vc4_dummy_plane(struct kunit *test,
-                                       struct drm_device *drm,
-                                       enum drm_plane_type type);
+struct drm_plane *vc4_dummy_plane(struct kunit *test, struct drm_device *drm,
+                                 enum drm_plane_type type);
 
 struct vc4_dummy_crtc {
        struct vc4_crtc crtc;

diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c b/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
index 62b18f5f41dba8ca0564e36ad6156af7bcc1043e..973f5f929097526967ae12c83b2051c6c3c0ef8e 100644 (file)
--- a/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
+++ b/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
@@ -22,15 +22,12 @@ static const uint32_t vc4_dummy_plane_formats[] = {
        DRM_FORMAT_XRGB8888,
 };
 
-struct vc4_dummy_plane *vc4_dummy_plane(struct kunit *test,
-                                       struct drm_device *drm,
-                                       enum drm_plane_type type)
+struct drm_plane *vc4_dummy_plane(struct kunit *test, struct drm_device *drm,
+                                 enum drm_plane_type type)
 {
-       struct vc4_dummy_plane *dummy_plane;
        struct drm_plane *plane;
 
-       dummy_plane = drmm_universal_plane_alloc(drm,
-                                                struct vc4_dummy_plane, plane.base,
+       plane = __drmm_universal_plane_alloc(drm, sizeof(struct drm_plane), 0,
                                                 0,
                                                 &vc4_dummy_plane_funcs,
                                                 vc4_dummy_plane_formats,
@@ -38,10 +35,9 @@ struct vc4_dummy_plane *vc4_dummy_plane(struct kunit *test,
                                                 NULL,
                                                 DRM_PLANE_TYPE_PRIMARY,
                                                 NULL);
-       KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dummy_plane);
+       KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane);
 
-       plane = &dummy_plane->plane.base;
        drm_plane_helper_add(plane, &vc4_dummy_plane_helper_funcs);
 
-       return dummy_plane;
+       return plane;
 }