| Message ID | 20240222-kms-hdmi-connector-state-v7-30-8f4af575fce2@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | drm/connector: Create HDMI Connector infrastructure | expand |
On 2/22/24 15:14, Maxime Ripard wrote: > 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> Best Regards, - Maíra > > Signed-off-by: Maxime Ripard <mripard@kernel.org> > --- > drivers/gpu/drm/vc4/tests/vc4_mock_plane.c | 34 +++++++----------------------- > 1 file changed, 8 insertions(+), 26 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c b/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c > index 973f5f929097..14357db82238 100644 > --- 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_EQ(test, type, DRM_PLANE_TYPE_PRIMARY); > + > + plane = drm_kunit_helper_create_primary_plane(test, drm, > + NULL, > + NULL, > + NULL, 0, > + NULL); > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane); > > - drm_plane_helper_add(plane, &vc4_dummy_plane_helper_funcs); > - > return plane; > } >
diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c b/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c index 973f5f929097..14357db82238 100644 --- 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_EQ(test, type, DRM_PLANE_TYPE_PRIMARY); + + plane = drm_kunit_helper_create_primary_plane(test, drm, + NULL, + NULL, + NULL, 0, + NULL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane); - drm_plane_helper_add(plane, &vc4_dummy_plane_helper_funcs); - return plane; }
Now that we have a plane create helper for kunit mocked drivers, let's convert to it in vc4. Signed-off-by: Maxime Ripard <mripard@kernel.org> --- drivers/gpu/drm/vc4/tests/vc4_mock_plane.c | 34 +++++++----------------------- 1 file changed, 8 insertions(+), 26 deletions(-)