Messages in this thread | | | Date | Mon, 26 Feb 2024 09:29:32 -0300 | Subject | Re: [PATCH v7 29/36] drm/vc4: tests: Remove vc4_dummy_plane structure | From | Maíra Canal <> |
| |
On 2/22/24 15:14, Maxime Ripard wrote: > The vc4_dummy_plane structure is an exact equivalent to vc4_plane, so we
Maybe I understood incorrectly, but isn't the vc4_dummy_plane structure equivalent to drm_plane?
Best Regards, - Maíra
> don't need it. > > Signed-off-by: Maxime Ripard <mripard@kernel.org> > --- > drivers/gpu/drm/vc4/tests/vc4_mock.c | 6 ++---- > drivers/gpu/drm/vc4/tests/vc4_mock.h | 9 ++------- > drivers/gpu/drm/vc4/tests/vc4_mock_plane.c | 14 +++++--------- > 3 files changed, 9 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock.c b/drivers/gpu/drm/vc4/tests/vc4_mock.c > index becb3dbaa548..0731a7d85d7a 100644 > --- 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 2d0b339bd9f3..002b6218960c 100644 > --- 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 62b18f5f41db..973f5f929097 100644 > --- 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; > } >
| |