Skip to content

L
linux
Commit 6da75526 authored by Michał Winiarski's avatar Michał Winiarski Committed by Maíra Canal
Browse files
Options

drm/format: Use appropriate types in expect/assert 

drm_format_info_* functions don't return bool, and the info variable is a
pointer.
Expecting non-NULL info will cause the test to crash if it is NULL in
checks that follow (which dereference it).
Use appropriate KUNIT_EXPECT/KUNIT_ASSERT variants.
Signed-off-by: default avatarMichał Winiarski <michal.winiarski@intel.com>
Reviewed-by: default avatarMaíra Canal <mairacanal@riseup.net>
Signed-off-by: default avatarMaíra Canal <mairacanal@riseup.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20220831215608.349269-1-michal.winiarski@intel.com
parent f3aaa612
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 76 deletions
drivers/gpu/drm/tests/drm_format_test.c
View file @ 6da75526
...@@ -14,40 +14,40 @@ static void igt_check_drm_format_block_width(struct kunit *test) ...@@ -14,40 +14,40 @@ static void igt_check_drm_format_block_width(struct kunit *test)
const struct drm_format_info *info = NULL; const struct drm_format_info *info = NULL;
/* Test invalid arguments */ /* Test invalid arguments */
KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, -1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, -1), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, 1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, 1), 0);
/* Test 1 plane format */ /* Test 1 plane format */
info = drm_format_info(DRM_FORMAT_XRGB4444); info = drm_format_info(DRM_FORMAT_XRGB4444);
KUNIT_EXPECT_TRUE(test, info); KUNIT_ASSERT_NOT_NULL(test, info);
KUNIT_EXPECT_TRUE(test, drm_format_info_block_width(info, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, 0), 1);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, 1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, 1), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, -1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, -1), 0);
/* Test 2 planes format */ /* Test 2 planes format */
info = drm_format_info(DRM_FORMAT_NV12); info = drm_format_info(DRM_FORMAT_NV12);
KUNIT_EXPECT_TRUE(test, info); KUNIT_ASSERT_NOT_NULL(test, info);
KUNIT_EXPECT_TRUE(test, drm_format_info_block_width(info, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, 0), 1);
KUNIT_EXPECT_TRUE(test, drm_format_info_block_width(info, 1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, 1), 1);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, 2)); KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, 2), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, -1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, -1), 0);
/* Test 3 planes format */ /* Test 3 planes format */
info = drm_format_info(DRM_FORMAT_YUV422); info = drm_format_info(DRM_FORMAT_YUV422);
KUNIT_EXPECT_TRUE(test, info); KUNIT_ASSERT_NOT_NULL(test, info);
KUNIT_EXPECT_TRUE(test, drm_format_info_block_width(info, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, 0), 1);
KUNIT_EXPECT_TRUE(test, drm_format_info_block_width(info, 1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, 1), 1);
KUNIT_EXPECT_TRUE(test, drm_format_info_block_width(info, 2)); KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, 2), 1);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, 3)); KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, 3), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, -1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, -1), 0);
/* Test a tiled format */ /* Test a tiled format */
info = drm_format_info(DRM_FORMAT_X0L0); info = drm_format_info(DRM_FORMAT_X0L0);
KUNIT_EXPECT_TRUE(test, info); KUNIT_ASSERT_NOT_NULL(test, info);
KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, 0), 2); KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, 0), 2);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, 1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, 1), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, -1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_width(info, -1), 0);
} }
static void igt_check_drm_format_block_height(struct kunit *test) static void igt_check_drm_format_block_height(struct kunit *test)
...@@ -55,40 +55,40 @@ static void igt_check_drm_format_block_height(struct kunit *test) ...@@ -55,40 +55,40 @@ static void igt_check_drm_format_block_height(struct kunit *test)
const struct drm_format_info *info = NULL; const struct drm_format_info *info = NULL;
/* Test invalid arguments */ /* Test invalid arguments */
KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, -1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, -1), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, 1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, 1), 0);
/* Test 1 plane format */ /* Test 1 plane format */
info = drm_format_info(DRM_FORMAT_XRGB4444); info = drm_format_info(DRM_FORMAT_XRGB4444);
KUNIT_EXPECT_TRUE(test, info); KUNIT_ASSERT_NOT_NULL(test, info);
KUNIT_EXPECT_TRUE(test, drm_format_info_block_height(info, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, 0), 1);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, -1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, -1), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, 1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, 1), 0);
/* Test 2 planes format */ /* Test 2 planes format */
info = drm_format_info(DRM_FORMAT_NV12); info = drm_format_info(DRM_FORMAT_NV12);
KUNIT_EXPECT_TRUE(test, info); KUNIT_ASSERT_NOT_NULL(test, info);
KUNIT_EXPECT_TRUE(test, drm_format_info_block_height(info, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, 0), 1);
KUNIT_EXPECT_TRUE(test, drm_format_info_block_height(info, 1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, 1), 1);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, 2)); KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, 2), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, -1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, -1), 0);
/* Test 3 planes format */ /* Test 3 planes format */
info = drm_format_info(DRM_FORMAT_YUV422); info = drm_format_info(DRM_FORMAT_YUV422);
KUNIT_EXPECT_TRUE(test, info); KUNIT_ASSERT_NOT_NULL(test, info);
KUNIT_EXPECT_TRUE(test, drm_format_info_block_height(info, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, 0), 1);
KUNIT_EXPECT_TRUE(test, drm_format_info_block_height(info, 1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, 1), 1);
KUNIT_EXPECT_TRUE(test, drm_format_info_block_height(info, 2)); KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, 2), 1);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, 3)); KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, 3), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, -1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, -1), 0);
/* Test a tiled format */ /* Test a tiled format */
info = drm_format_info(DRM_FORMAT_X0L0); info = drm_format_info(DRM_FORMAT_X0L0);
KUNIT_EXPECT_TRUE(test, info); KUNIT_ASSERT_NOT_NULL(test, info);
KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, 0), 2); KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, 0), 2);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, 1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, 1), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, -1)); KUNIT_EXPECT_EQ(test, drm_format_info_block_height(info, -1), 0);
} }
static void igt_check_drm_format_min_pitch_for_single_plane(struct kunit *test) static void igt_check_drm_format_min_pitch_for_single_plane(struct kunit *test)
...@@ -96,16 +96,16 @@ static void igt_check_drm_format_min_pitch_for_single_plane(struct kunit *test) ...@@ -96,16 +96,16 @@ static void igt_check_drm_format_min_pitch_for_single_plane(struct kunit *test)
const struct drm_format_info *info = NULL; const struct drm_format_info *info = NULL;
/* Test invalid arguments */ /* Test invalid arguments */
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, -1, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 0), 0);
/* Test 1 plane 8 bits per pixel format */ /* Test 1 plane 8 bits per pixel format */
info = drm_format_info(DRM_FORMAT_RGB332); info = drm_format_info(DRM_FORMAT_RGB332);
KUNIT_EXPECT_TRUE(test, info); KUNIT_ASSERT_NOT_NULL(test, info);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, -1, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 0), 0);
KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 1); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 1);
KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 2), 2); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 2), 2);
...@@ -121,10 +121,10 @@ static void igt_check_drm_format_min_pitch_for_single_plane(struct kunit *test) ...@@ -121,10 +121,10 @@ static void igt_check_drm_format_min_pitch_for_single_plane(struct kunit *test)
/* Test 1 plane 16 bits per pixel format */ /* Test 1 plane 16 bits per pixel format */
info = drm_format_info(DRM_FORMAT_XRGB4444); info = drm_format_info(DRM_FORMAT_XRGB4444);
KUNIT_EXPECT_TRUE(test, info); KUNIT_ASSERT_NOT_NULL(test, info);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, -1, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 0), 0);
KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 2); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 2);
KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 2), 4); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 2), 4);
...@@ -140,10 +140,10 @@ static void igt_check_drm_format_min_pitch_for_single_plane(struct kunit *test) ...@@ -140,10 +140,10 @@ static void igt_check_drm_format_min_pitch_for_single_plane(struct kunit *test)
/* Test 1 plane 24 bits per pixel format */ /* Test 1 plane 24 bits per pixel format */
info = drm_format_info(DRM_FORMAT_RGB888); info = drm_format_info(DRM_FORMAT_RGB888);
KUNIT_EXPECT_TRUE(test, info); KUNIT_ASSERT_NOT_NULL(test, info);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, -1, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 0), 0);
KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 3); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 3);
KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 2), 6); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 2), 6);
...@@ -159,10 +159,10 @@ static void igt_check_drm_format_min_pitch_for_single_plane(struct kunit *test) ...@@ -159,10 +159,10 @@ static void igt_check_drm_format_min_pitch_for_single_plane(struct kunit *test)
/* Test 1 plane 32 bits per pixel format */ /* Test 1 plane 32 bits per pixel format */
info = drm_format_info(DRM_FORMAT_ABGR8888); info = drm_format_info(DRM_FORMAT_ABGR8888);
KUNIT_EXPECT_TRUE(test, info); KUNIT_ASSERT_NOT_NULL(test, info);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, -1, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 0), 0);
KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 4); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 4);
KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 2), 8); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 2), 8);
...@@ -183,11 +183,11 @@ static void igt_check_drm_format_min_pitch_for_multi_planar(struct kunit *test) ...@@ -183,11 +183,11 @@ static void igt_check_drm_format_min_pitch_for_multi_planar(struct kunit *test)
/* Test 2 planes format */ /* Test 2 planes format */
info = drm_format_info(DRM_FORMAT_NV12); info = drm_format_info(DRM_FORMAT_NV12);
KUNIT_EXPECT_TRUE(test, info); KUNIT_ASSERT_NOT_NULL(test, info);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, -1, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 2, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, 0), 0);
KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 1); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 1);
KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 1), 2); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 1), 2);
...@@ -214,12 +214,12 @@ static void igt_check_drm_format_min_pitch_for_multi_planar(struct kunit *test) ...@@ -214,12 +214,12 @@ static void igt_check_drm_format_min_pitch_for_multi_planar(struct kunit *test)
/* Test 3 planes 8 bits per pixel format */ /* Test 3 planes 8 bits per pixel format */
info = drm_format_info(DRM_FORMAT_YUV422); info = drm_format_info(DRM_FORMAT_YUV422);
KUNIT_EXPECT_TRUE(test, info); KUNIT_ASSERT_NOT_NULL(test, info);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 2, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, -1, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 3, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 3, 0), 0);
KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 1); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 1);
KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 1), 1); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 1), 1);
...@@ -262,10 +262,10 @@ static void igt_check_drm_format_min_pitch_for_tiled_format(struct kunit *test) ...@@ -262,10 +262,10 @@ static void igt_check_drm_format_min_pitch_for_tiled_format(struct kunit *test)
/* Test tiled format */ /* Test tiled format */
info = drm_format_info(DRM_FORMAT_X0L2); info = drm_format_info(DRM_FORMAT_X0L2);
KUNIT_EXPECT_TRUE(test, info); KUNIT_ASSERT_NOT_NULL(test, info);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, -1, 0), 0);
KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 0)); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 0), 0);
KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 2); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1), 2);
KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 2), 4); KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 2), 4);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7