| Message ID | 20240703172228.11166-5-gcarlos@disroot.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Increase coverage on drm_framebuffer.c | expand |
On Wed, Jul 03, 2024 at 02:22:23PM GMT, Carlos Eduardo Gallo Filho wrote: > Introduce a test to cover the creation of framebuffer with > modifier on a device that doesn't support it. > > Signed-off-by: Carlos Eduardo Gallo Filho <gcarlos@disroot.org> > --- > v2: > - Reorder kunit cases alphabetically. > v3: > - Replace the use of void pointer on drm_framebuffer_test_priv struct. > - Test return value of drm_internal_framebuffer_create(). > - Change test documentation to don't rely on another test. > --- > drivers/gpu/drm/tests/drm_framebuffer_test.c | 25 ++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/drivers/gpu/drm/tests/drm_framebuffer_test.c b/drivers/gpu/drm/tests/drm_framebuffer_test.c > index 4b1884be9d7a..22966ebfe9cb 100644 > --- a/drivers/gpu/drm/tests/drm_framebuffer_test.c > +++ b/drivers/gpu/drm/tests/drm_framebuffer_test.c > @@ -415,8 +415,33 @@ static void drm_framebuffer_test_to_desc(const struct drm_framebuffer_test *t, c > KUNIT_ARRAY_PARAM(drm_framebuffer_create, drm_framebuffer_create_cases, > drm_framebuffer_test_to_desc); > > +/* Tries to create a framebuffer with modifiers without drm_device supporting it */ > +static void drm_test_framebuffer_modifiers_not_supported(struct kunit *test) > +{ > + struct drm_framebuffer_test_priv *priv = test->priv; > + struct drm_device *dev = &priv->dev; > + struct drm_framebuffer *fb; > + > + /* A valid cmd with modifier */ > + struct drm_mode_fb_cmd2 cmd = { > + .width = MAX_WIDTH, .height = MAX_HEIGHT, > + .pixel_format = DRM_FORMAT_ABGR8888, .handles = { 1, 0, 0 }, > + .offsets = { UINT_MAX / 2, 0, 0 }, .pitches = { 4 * MAX_WIDTH, 0, 0 }, > + .flags = DRM_MODE_FB_MODIFIERS, > + }; > + > + priv->buffer_created = false; > + dev->mode_config.fb_modifiers_not_supported = 1; > + > + fb = drm_internal_framebuffer_create(dev, &cmd, NULL); > + KUNIT_EXPECT_EQ(test, false, priv->buffer_created); > + KUNIT_ASSERT_EQ(test, IS_ERR(fb), true); > + KUNIT_EXPECT_EQ(test, PTR_ERR(fb), -EINVAL); I'd rather have the actual and expected values always in the same order, preferably the former first. Also, is there a reason you assert that it's an error, and then expect the error code? You can remove the assertion, it's already covered by the expectation. Maxime
diff --git a/drivers/gpu/drm/tests/drm_framebuffer_test.c b/drivers/gpu/drm/tests/drm_framebuffer_test.c index 4b1884be9d7a..22966ebfe9cb 100644 --- a/drivers/gpu/drm/tests/drm_framebuffer_test.c +++ b/drivers/gpu/drm/tests/drm_framebuffer_test.c @@ -415,8 +415,33 @@ static void drm_framebuffer_test_to_desc(const struct drm_framebuffer_test *t, c KUNIT_ARRAY_PARAM(drm_framebuffer_create, drm_framebuffer_create_cases, drm_framebuffer_test_to_desc); +/* Tries to create a framebuffer with modifiers without drm_device supporting it */ +static void drm_test_framebuffer_modifiers_not_supported(struct kunit *test) +{ + struct drm_framebuffer_test_priv *priv = test->priv; + struct drm_device *dev = &priv->dev; + struct drm_framebuffer *fb; + + /* A valid cmd with modifier */ + struct drm_mode_fb_cmd2 cmd = { + .width = MAX_WIDTH, .height = MAX_HEIGHT, + .pixel_format = DRM_FORMAT_ABGR8888, .handles = { 1, 0, 0 }, + .offsets = { UINT_MAX / 2, 0, 0 }, .pitches = { 4 * MAX_WIDTH, 0, 0 }, + .flags = DRM_MODE_FB_MODIFIERS, + }; + + priv->buffer_created = false; + dev->mode_config.fb_modifiers_not_supported = 1; + + fb = drm_internal_framebuffer_create(dev, &cmd, NULL); + KUNIT_EXPECT_EQ(test, false, priv->buffer_created); + KUNIT_ASSERT_EQ(test, IS_ERR(fb), true); + KUNIT_EXPECT_EQ(test, PTR_ERR(fb), -EINVAL); +} + static struct kunit_case drm_framebuffer_tests[] = { KUNIT_CASE_PARAM(drm_test_framebuffer_create, drm_framebuffer_create_gen_params), + KUNIT_CASE(drm_test_framebuffer_modifiers_not_supported), { } };
Introduce a test to cover the creation of framebuffer with modifier on a device that doesn't support it. Signed-off-by: Carlos Eduardo Gallo Filho <gcarlos@disroot.org> --- v2: - Reorder kunit cases alphabetically. v3: - Replace the use of void pointer on drm_framebuffer_test_priv struct. - Test return value of drm_internal_framebuffer_create(). - Change test documentation to don't rely on another test. --- drivers/gpu/drm/tests/drm_framebuffer_test.c | 25 ++++++++++++++++++++ 1 file changed, 25 insertions(+)