| Message ID | 20220729124726.748221-1-mairacanal@riseup.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | cf1e6a90315a3f5b8ecbb3cf6a4badf8978e9075 |
| Headers | show |
| Series | [v2] drm/tests: Split up test cases in igt_check_drm_format_min_pitch | expand |
On 07/29, Maíra Canal wrote: > The igt_check_drm_format_min_pitch() function had a lot of > KUNIT_EXPECT_* calls, all of which ended up allocating and initializing > various test assertion structures on the stack. > > This behavior was producing -Wframe-larger-than warnings on PowerPC, i386, > and MIPS architectures, such as: > > drivers/gpu/drm/tests/drm_format_test.c: In function 'igt_check_drm_format_min_pitch': > drivers/gpu/drm/tests/drm_format_test.c:271:1: error: the frame size of > 3712 bytes is larger than 2048 bytes > > So, the igt_check_drm_format_min_pitch() test case was split into three > smaller functions: one testing single plane formats, one testing > multi-planar formats, and the other testing tiled formats. > > Fixes: 0421bb0baa84 ("drm: selftest: convert drm_format selftest to KUnit") > Reported-by: kernel test robot <lkp@intel.com> > Reported-by: Guenter Roeck <linux@roeck-us.net> > Signed-off-by: Maíra Canal <mairacanal@riseup.net> > Tested-by: Guenter Roeck <linux@roeck-us.net> > Reviewed-by: André Almeida <andrealmeid@igalia.com> Applied to drm-misc-next Thanks, Melissa > --- > v1 -> v2: > - Add Guenter's Tested-by tag. > - Add André's Reviewed-by tag. > - Replace "multiple planes" for "multi-planar" (André Almeida). > - Add Fixes tag (Melissa Wen). > --- > drivers/gpu/drm/tests/drm_format_test.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/tests/drm_format_test.c b/drivers/gpu/drm/tests/drm_format_test.c > index 056cb8599d6d..afb4bca72187 100644 > --- a/drivers/gpu/drm/tests/drm_format_test.c > +++ b/drivers/gpu/drm/tests/drm_format_test.c > @@ -91,7 +91,7 @@ static void igt_check_drm_format_block_height(struct kunit *test) > KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, -1)); > } > > -static void igt_check_drm_format_min_pitch(struct kunit *test) > +static void igt_check_drm_format_min_pitch_for_single_plane(struct kunit *test) > { > const struct drm_format_info *info = NULL; > > @@ -175,6 +175,11 @@ static void igt_check_drm_format_min_pitch(struct kunit *test) > (uint64_t)UINT_MAX * 4); > KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, (UINT_MAX - 1)), > (uint64_t)(UINT_MAX - 1) * 4); > +} > + > +static void igt_check_drm_format_min_pitch_for_multi_planar(struct kunit *test) > +{ > + const struct drm_format_info *info = NULL; > > /* Test 2 planes format */ > info = drm_format_info(DRM_FORMAT_NV12); > @@ -249,6 +254,11 @@ static void igt_check_drm_format_min_pitch(struct kunit *test) > (uint64_t)(UINT_MAX - 1) / 2); > KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, (UINT_MAX - 1) / 2), > (uint64_t)(UINT_MAX - 1) / 2); > +} > + > +static void igt_check_drm_format_min_pitch_for_tiled_format(struct kunit *test) > +{ > + const struct drm_format_info *info = NULL; > > /* Test tiled format */ > info = drm_format_info(DRM_FORMAT_X0L2); > @@ -273,7 +283,9 @@ static void igt_check_drm_format_min_pitch(struct kunit *test) > static struct kunit_case drm_format_tests[] = { > KUNIT_CASE(igt_check_drm_format_block_width), > KUNIT_CASE(igt_check_drm_format_block_height), > - KUNIT_CASE(igt_check_drm_format_min_pitch), > + KUNIT_CASE(igt_check_drm_format_min_pitch_for_single_plane), > + KUNIT_CASE(igt_check_drm_format_min_pitch_for_multi_planar), > + KUNIT_CASE(igt_check_drm_format_min_pitch_for_tiled_format), > { } > }; > > -- > 2.37.1 >
diff --git a/drivers/gpu/drm/tests/drm_format_test.c b/drivers/gpu/drm/tests/drm_format_test.c index 056cb8599d6d..afb4bca72187 100644 --- a/drivers/gpu/drm/tests/drm_format_test.c +++ b/drivers/gpu/drm/tests/drm_format_test.c @@ -91,7 +91,7 @@ static void igt_check_drm_format_block_height(struct kunit *test) KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, -1)); } -static void igt_check_drm_format_min_pitch(struct kunit *test) +static void igt_check_drm_format_min_pitch_for_single_plane(struct kunit *test) { const struct drm_format_info *info = NULL; @@ -175,6 +175,11 @@ static void igt_check_drm_format_min_pitch(struct kunit *test) (uint64_t)UINT_MAX * 4); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, (UINT_MAX - 1)), (uint64_t)(UINT_MAX - 1) * 4); +} + +static void igt_check_drm_format_min_pitch_for_multi_planar(struct kunit *test) +{ + const struct drm_format_info *info = NULL; /* Test 2 planes format */ info = drm_format_info(DRM_FORMAT_NV12); @@ -249,6 +254,11 @@ static void igt_check_drm_format_min_pitch(struct kunit *test) (uint64_t)(UINT_MAX - 1) / 2); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, (UINT_MAX - 1) / 2), (uint64_t)(UINT_MAX - 1) / 2); +} + +static void igt_check_drm_format_min_pitch_for_tiled_format(struct kunit *test) +{ + const struct drm_format_info *info = NULL; /* Test tiled format */ info = drm_format_info(DRM_FORMAT_X0L2); @@ -273,7 +283,9 @@ static void igt_check_drm_format_min_pitch(struct kunit *test) static struct kunit_case drm_format_tests[] = { KUNIT_CASE(igt_check_drm_format_block_width), KUNIT_CASE(igt_check_drm_format_block_height), - KUNIT_CASE(igt_check_drm_format_min_pitch), + KUNIT_CASE(igt_check_drm_format_min_pitch_for_single_plane), + KUNIT_CASE(igt_check_drm_format_min_pitch_for_multi_planar), + KUNIT_CASE(igt_check_drm_format_min_pitch_for_tiled_format), { } };
The igt_check_drm_format_min_pitch() function had a lot of KUNIT_EXPECT_* calls, all of which ended up allocating and initializing various test assertion structures on the stack. This behavior was producing -Wframe-larger-than warnings on PowerPC, i386, and MIPS architectures, such as: drivers/gpu/drm/tests/drm_format_test.c: In function 'igt_check_drm_format_min_pitch': drivers/gpu/drm/tests/drm_format_test.c:271:1: error: the frame size of 3712 bytes is larger than 2048 bytes So, the igt_check_drm_format_min_pitch() test case was split into three smaller functions: one testing single plane formats, one testing multi-planar formats, and the other testing tiled formats. Fixes: 0421bb0baa84 ("drm: selftest: convert drm_format selftest to KUnit") Reported-by: kernel test robot <lkp@intel.com> Reported-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Maíra Canal <mairacanal@riseup.net> Tested-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: André Almeida <andrealmeid@igalia.com> --- v1 -> v2: - Add Guenter's Tested-by tag. - Add André's Reviewed-by tag. - Replace "multiple planes" for "multi-planar" (André Almeida). - Add Fixes tag (Melissa Wen). --- drivers/gpu/drm/tests/drm_format_test.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)