| Message ID | 20231024191002.1620-5-gcarlos@disroot.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Increase coverage on drm_framebuffer.c | expand |
Hi, On Tue, Oct 24, 2023 at 04:09:55PM -0300, 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. > --- > drivers/gpu/drm/tests/drm_framebuffer_test.c | 28 ++++++++++++++++++++ > 1 file changed, 28 insertions(+) > > diff --git a/drivers/gpu/drm/tests/drm_framebuffer_test.c b/drivers/gpu/drm/tests/drm_framebuffer_test.c > index eb76a71644e9..8a9b6d08d639 100644 > --- a/drivers/gpu/drm/tests/drm_framebuffer_test.c > +++ b/drivers/gpu/drm/tests/drm_framebuffer_test.c > @@ -403,8 +403,36 @@ 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); > > +/* > + * This test is very similar to drm_test_framebuffer_create, except that it We shouldn't rely on the another test for the documentation. If drm_test_framebuffer_create is ever removed or renamed, then the reader won't have any clue what it was supposed to test. We should provide a documentation that doesn't require any additional context. > + * set dev->mode_config.fb_modifiers_not_supported member to 1, covering > + * the case of trying to create a framebuffer with modifiers without the > + * device really supporting it. > + */ So I guess something like: Test that, if a device doesn't support modifiers, a framebuffer allocation using them will fail. > +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; > + int buffer_created = 0; > + > + /* 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->private = &buffer_created; > + dev->mode_config.fb_modifiers_not_supported = 1; > + > + drm_internal_framebuffer_create(dev, &cmd, NULL); > + KUNIT_EXPECT_EQ(test, 0, buffer_created); We should test the returned value of drm_internal_framebuffer_create here. Maxime
diff --git a/drivers/gpu/drm/tests/drm_framebuffer_test.c b/drivers/gpu/drm/tests/drm_framebuffer_test.c index eb76a71644e9..8a9b6d08d639 100644 --- a/drivers/gpu/drm/tests/drm_framebuffer_test.c +++ b/drivers/gpu/drm/tests/drm_framebuffer_test.c @@ -403,8 +403,36 @@ 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); +/* + * This test is very similar to drm_test_framebuffer_create, except that it + * set dev->mode_config.fb_modifiers_not_supported member to 1, covering + * the case of trying to create a framebuffer with modifiers without the + * device really 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; + int buffer_created = 0; + + /* 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->private = &buffer_created; + dev->mode_config.fb_modifiers_not_supported = 1; + + drm_internal_framebuffer_create(dev, &cmd, NULL); + KUNIT_EXPECT_EQ(test, 0, buffer_created); +} + 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. --- drivers/gpu/drm/tests/drm_framebuffer_test.c | 28 ++++++++++++++++++++ 1 file changed, 28 insertions(+)