drm: selftest: convert drm_format selftest to KUnit

Considering the current adoption of the KUnit framework, convert the
DRM format selftest to the KUnit API.

Tested-by: David Gow <davidgow@google.com>
Acked-by: Daniel Latypov <dlatypov@google.com>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Signed-off-by: Maíra Canal <maira.canal@usp.br>
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220708203052.236290-5-maira.canal@usp.br

diff --git a/drivers/gpu/drm/selftests/Makefile b/drivers/gpu/drm/selftests/Makefile
index 8a79491..b7f252d 100644 (file)
--- a/drivers/gpu/drm/selftests/Makefile
+++ b/drivers/gpu/drm/selftests/Makefile
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 test-drm_modeset-y := test-drm_modeset_common.o test-drm_plane_helper.o \
-                      test-drm_format.o test-drm_framebuffer.o \
-                     test-drm_dp_mst_helper.o
+                      test-drm_framebuffer.o test-drm_dp_mst_helper.o
 
 obj-$(CONFIG_DRM_DEBUG_SELFTEST) += test-drm_mm.o test-drm_modeset.o \
                                    test-drm_buddy.o

diff --git a/drivers/gpu/drm/selftests/drm_modeset_selftests.h b/drivers/gpu/drm/selftests/drm_modeset_selftests.h
index a3ca903..63061ef 100644 (file)
--- a/drivers/gpu/drm/selftests/drm_modeset_selftests.h
+++ b/drivers/gpu/drm/selftests/drm_modeset_selftests.h
@@ -7,9 +7,6 @@
  * Tests are executed in order by igt/drm_selftests_helper
  */
 selftest(check_plane_state, igt_check_plane_state)
-selftest(check_drm_format_block_width, igt_check_drm_format_block_width)
-selftest(check_drm_format_block_height, igt_check_drm_format_block_height)
-selftest(check_drm_format_min_pitch, igt_check_drm_format_min_pitch)
 selftest(check_drm_framebuffer_create, igt_check_drm_framebuffer_create)
 selftest(dp_mst_calc_pbn_mode, igt_dp_mst_calc_pbn_mode)
 selftest(dp_mst_sideband_msg_req_decode, igt_dp_mst_sideband_msg_req_decode)

diff --git a/drivers/gpu/drm/selftests/test-drm_format.c b/drivers/gpu/drm/selftests/test-drm_format.c
deleted file mode 100644 (file)
index c5e212a..0000000
--- a/drivers/gpu/drm/selftests/test-drm_format.c
+++ /dev/null
@@ -1,280 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Test cases for the drm_format functions
- */
-
-#define pr_fmt(fmt) "drm_format: " fmt
-
-#include <linux/errno.h>
-#include <linux/kernel.h>
-
-#include <drm/drm_fourcc.h>
-
-#include "test-drm_modeset_common.h"
-
-int igt_check_drm_format_block_width(void *ignored)
-{
-       const struct drm_format_info *info = NULL;
-
-       /* Test invalid arguments */
-       FAIL_ON(drm_format_info_block_width(info, 0) != 0);
-       FAIL_ON(drm_format_info_block_width(info, -1) != 0);
-       FAIL_ON(drm_format_info_block_width(info, 1) != 0);
-
-       /* Test 1 plane format */
-       info = drm_format_info(DRM_FORMAT_XRGB4444);
-       FAIL_ON(!info);
-       FAIL_ON(drm_format_info_block_width(info, 0) != 1);
-       FAIL_ON(drm_format_info_block_width(info, 1) != 0);
-       FAIL_ON(drm_format_info_block_width(info, -1) != 0);
-
-       /* Test 2 planes format */
-       info = drm_format_info(DRM_FORMAT_NV12);
-       FAIL_ON(!info);
-       FAIL_ON(drm_format_info_block_width(info, 0) != 1);
-       FAIL_ON(drm_format_info_block_width(info, 1) != 1);
-       FAIL_ON(drm_format_info_block_width(info, 2) != 0);
-       FAIL_ON(drm_format_info_block_width(info, -1) != 0);
-
-       /* Test 3 planes format */
-       info = drm_format_info(DRM_FORMAT_YUV422);
-       FAIL_ON(!info);
-       FAIL_ON(drm_format_info_block_width(info, 0) != 1);
-       FAIL_ON(drm_format_info_block_width(info, 1) != 1);
-       FAIL_ON(drm_format_info_block_width(info, 2) != 1);
-       FAIL_ON(drm_format_info_block_width(info, 3) != 0);
-       FAIL_ON(drm_format_info_block_width(info, -1) != 0);
-
-       /* Test a tiled format */
-       info = drm_format_info(DRM_FORMAT_X0L0);
-       FAIL_ON(!info);
-       FAIL_ON(drm_format_info_block_width(info, 0) != 2);
-       FAIL_ON(drm_format_info_block_width(info, 1) != 0);
-       FAIL_ON(drm_format_info_block_width(info, -1) != 0);
-
-       return 0;
-}
-
-int igt_check_drm_format_block_height(void *ignored)
-{
-       const struct drm_format_info *info = NULL;
-
-       /* Test invalid arguments */
-       FAIL_ON(drm_format_info_block_height(info, 0) != 0);
-       FAIL_ON(drm_format_info_block_height(info, -1) != 0);
-       FAIL_ON(drm_format_info_block_height(info, 1) != 0);
-
-       /* Test 1 plane format */
-       info = drm_format_info(DRM_FORMAT_XRGB4444);
-       FAIL_ON(!info);
-       FAIL_ON(drm_format_info_block_height(info, 0) != 1);
-       FAIL_ON(drm_format_info_block_height(info, 1) != 0);
-       FAIL_ON(drm_format_info_block_height(info, -1) != 0);
-
-       /* Test 2 planes format */
-       info = drm_format_info(DRM_FORMAT_NV12);
-       FAIL_ON(!info);
-       FAIL_ON(drm_format_info_block_height(info, 0) != 1);
-       FAIL_ON(drm_format_info_block_height(info, 1) != 1);
-       FAIL_ON(drm_format_info_block_height(info, 2) != 0);
-       FAIL_ON(drm_format_info_block_height(info, -1) != 0);
-
-       /* Test 3 planes format */
-       info = drm_format_info(DRM_FORMAT_YUV422);
-       FAIL_ON(!info);
-       FAIL_ON(drm_format_info_block_height(info, 0) != 1);
-       FAIL_ON(drm_format_info_block_height(info, 1) != 1);
-       FAIL_ON(drm_format_info_block_height(info, 2) != 1);
-       FAIL_ON(drm_format_info_block_height(info, 3) != 0);
-       FAIL_ON(drm_format_info_block_height(info, -1) != 0);
-
-       /* Test a tiled format */
-       info = drm_format_info(DRM_FORMAT_X0L0);
-       FAIL_ON(!info);
-       FAIL_ON(drm_format_info_block_height(info, 0) != 2);
-       FAIL_ON(drm_format_info_block_height(info, 1) != 0);
-       FAIL_ON(drm_format_info_block_height(info, -1) != 0);
-
-       return 0;
-}
-
-int igt_check_drm_format_min_pitch(void *ignored)
-{
-       const struct drm_format_info *info = NULL;
-
-       /* Test invalid arguments */
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 0) != 0);
-       FAIL_ON(drm_format_info_min_pitch(info, -1, 0) != 0);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 0) != 0);
-
-       /* Test 1 plane 8 bits per pixel format */
-       info = drm_format_info(DRM_FORMAT_RGB332);
-       FAIL_ON(!info);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 0) != 0);
-       FAIL_ON(drm_format_info_min_pitch(info, -1, 0) != 0);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 0) != 0);
-
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1) != 1);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 2) != 2);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 640) != 640);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1024) != 1024);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1920) != 1920);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 4096) != 4096);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 671) != 671);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX) !=
-                       (uint64_t)UINT_MAX);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, (UINT_MAX - 1)) !=
-                       (uint64_t)(UINT_MAX - 1));
-
-       /* Test 1 plane 16 bits per pixel format */
-       info = drm_format_info(DRM_FORMAT_XRGB4444);
-       FAIL_ON(!info);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 0) != 0);
-       FAIL_ON(drm_format_info_min_pitch(info, -1, 0) != 0);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 0) != 0);
-
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1) != 2);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 2) != 4);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 640) != 1280);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1024) != 2048);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1920) != 3840);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 4096) != 8192);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 671) != 1342);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX) !=
-                       (uint64_t)UINT_MAX * 2);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, (UINT_MAX - 1)) !=
-                       (uint64_t)(UINT_MAX - 1) * 2);
-
-       /* Test 1 plane 24 bits per pixel format */
-       info = drm_format_info(DRM_FORMAT_RGB888);
-       FAIL_ON(!info);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 0) != 0);
-       FAIL_ON(drm_format_info_min_pitch(info, -1, 0) != 0);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 0) != 0);
-
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1) != 3);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 2) != 6);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 640) != 1920);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1024) != 3072);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1920) != 5760);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 4096) != 12288);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 671) != 2013);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX) !=
-                       (uint64_t)UINT_MAX * 3);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX - 1) !=
-                       (uint64_t)(UINT_MAX - 1) * 3);
-
-       /* Test 1 plane 32 bits per pixel format */
-       info = drm_format_info(DRM_FORMAT_ABGR8888);
-       FAIL_ON(!info);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 0) != 0);
-       FAIL_ON(drm_format_info_min_pitch(info, -1, 0) != 0);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 0) != 0);
-
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1) != 4);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 2) != 8);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 640) != 2560);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1024) != 4096);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1920) != 7680);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 4096) != 16384);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 671) != 2684);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX) !=
-                       (uint64_t)UINT_MAX * 4);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX - 1) !=
-                       (uint64_t)(UINT_MAX - 1) * 4);
-
-       /* Test 2 planes format */
-       info = drm_format_info(DRM_FORMAT_NV12);
-       FAIL_ON(!info);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 0) != 0);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 0) != 0);
-       FAIL_ON(drm_format_info_min_pitch(info, -1, 0) != 0);
-       FAIL_ON(drm_format_info_min_pitch(info, 2, 0) != 0);
-
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1) != 1);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 1) != 2);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 2) != 2);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 1) != 2);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 640) != 640);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 320) != 640);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1024) != 1024);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 512) != 1024);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1920) != 1920);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 960) != 1920);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 4096) != 4096);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 2048) != 4096);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 671) != 671);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 336) != 672);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX) !=
-                       (uint64_t)UINT_MAX);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, UINT_MAX / 2 + 1) !=
-                       (uint64_t)UINT_MAX + 1);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, (UINT_MAX - 1)) !=
-                       (uint64_t)(UINT_MAX - 1));
-       FAIL_ON(drm_format_info_min_pitch(info, 1, (UINT_MAX - 1) /  2) !=
-                       (uint64_t)(UINT_MAX - 1));
-
-       /* Test 3 planes 8 bits per pixel format */
-       info = drm_format_info(DRM_FORMAT_YUV422);
-       FAIL_ON(!info);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 0) != 0);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 0) != 0);
-       FAIL_ON(drm_format_info_min_pitch(info, 2, 0) != 0);
-       FAIL_ON(drm_format_info_min_pitch(info, -1, 0) != 0);
-       FAIL_ON(drm_format_info_min_pitch(info, 3, 0) != 0);
-
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1) != 1);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 1) != 1);
-       FAIL_ON(drm_format_info_min_pitch(info, 2, 1) != 1);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 2) != 2);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 2) != 2);
-       FAIL_ON(drm_format_info_min_pitch(info, 2, 2) != 2);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 640) != 640);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 320) != 320);
-       FAIL_ON(drm_format_info_min_pitch(info, 2, 320) != 320);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1024) != 1024);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 512) != 512);
-       FAIL_ON(drm_format_info_min_pitch(info, 2, 512) != 512);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1920) != 1920);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 960) != 960);
-       FAIL_ON(drm_format_info_min_pitch(info, 2, 960) != 960);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 4096) != 4096);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 2048) != 2048);
-       FAIL_ON(drm_format_info_min_pitch(info, 2, 2048) != 2048);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 671) != 671);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 336) != 336);
-       FAIL_ON(drm_format_info_min_pitch(info, 2, 336) != 336);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX) !=
-                       (uint64_t)UINT_MAX);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, UINT_MAX / 2 + 1) !=
-                       (uint64_t)UINT_MAX / 2 + 1);
-       FAIL_ON(drm_format_info_min_pitch(info, 2, UINT_MAX / 2 + 1) !=
-                       (uint64_t)UINT_MAX / 2 + 1);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, (UINT_MAX - 1) / 2) !=
-                       (uint64_t)(UINT_MAX - 1) / 2);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, (UINT_MAX - 1) / 2) !=
-                       (uint64_t)(UINT_MAX - 1) / 2);
-       FAIL_ON(drm_format_info_min_pitch(info, 2, (UINT_MAX - 1) / 2) !=
-                       (uint64_t)(UINT_MAX - 1) / 2);
-
-       /* Test tiled format */
-       info = drm_format_info(DRM_FORMAT_X0L2);
-       FAIL_ON(!info);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 0) != 0);
-       FAIL_ON(drm_format_info_min_pitch(info, -1, 0) != 0);
-       FAIL_ON(drm_format_info_min_pitch(info, 1, 0) != 0);
-
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1) != 2);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 2) != 4);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 640) != 1280);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1024) != 2048);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 1920) != 3840);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 4096) != 8192);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, 671) != 1342);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX) !=
-                       (uint64_t)UINT_MAX * 2);
-       FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX - 1) !=
-                       (uint64_t)(UINT_MAX - 1) * 2);
-
-       return 0;
-}

diff --git a/drivers/gpu/drm/selftests/test-drm_modeset_common.h b/drivers/gpu/drm/selftests/test-drm_modeset_common.h
index 42a10d7..5709d96 100644 (file)
--- a/drivers/gpu/drm/selftests/test-drm_modeset_common.h
+++ b/drivers/gpu/drm/selftests/test-drm_modeset_common.h
@@ -17,9 +17,6 @@
 #define FAIL_ON(x) FAIL((x), "%s", "FAIL_ON(" __stringify(x) ")\n")
 
 int igt_check_plane_state(void *ignored);
-int igt_check_drm_format_block_width(void *ignored);
-int igt_check_drm_format_block_height(void *ignored);
-int igt_check_drm_format_min_pitch(void *ignored);
 int igt_check_drm_framebuffer_create(void *ignored);
 int igt_dp_mst_calc_pbn_mode(void *ignored);
 int igt_dp_mst_sideband_msg_req_decode(void *ignored);

diff --git a/drivers/gpu/drm/tests/Makefile b/drivers/gpu/drm/tests/Makefile
index f2eced3..1aa1627 100644 (file)
--- a/drivers/gpu/drm/tests/Makefile
+++ b/drivers/gpu/drm/tests/Makefile
@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_DRM_KUNIT_TEST) += drm_format_helper_test.o drm_damage_helper_test.o \
-       drm_cmdline_parser_test.o drm_rect_test.o
+       drm_cmdline_parser_test.o drm_rect_test.o drm_format_test.o

diff --git a/drivers/gpu/drm/tests/drm_format_test.c b/drivers/gpu/drm/tests/drm_format_test.c
new file mode 100644 (file)
index 0000000..056cb85
--- /dev/null
+++ b/drivers/gpu/drm/tests/drm_format_test.c
@@ -0,0 +1,287 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Test cases for the drm_format functions
+ *
+ * Copyright (c) 2022 Maíra Canal <mairacanal@riseup.net>
+ */
+
+#include <kunit/test.h>
+
+#include <drm/drm_fourcc.h>
+
+static void igt_check_drm_format_block_width(struct kunit *test)
+{
+       const struct drm_format_info *info = NULL;
+
+       /* Test invalid arguments */
+       KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, -1));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, 1));
+
+       /* Test 1 plane format */
+       info = drm_format_info(DRM_FORMAT_XRGB4444);
+       KUNIT_EXPECT_TRUE(test, info);
+       KUNIT_EXPECT_TRUE(test, drm_format_info_block_width(info, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, 1));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, -1));
+
+       /* Test 2 planes format */
+       info = drm_format_info(DRM_FORMAT_NV12);
+       KUNIT_EXPECT_TRUE(test, info);
+       KUNIT_EXPECT_TRUE(test, drm_format_info_block_width(info, 0));
+       KUNIT_EXPECT_TRUE(test, drm_format_info_block_width(info, 1));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, 2));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, -1));
+
+       /* Test 3 planes format */
+       info = drm_format_info(DRM_FORMAT_YUV422);
+       KUNIT_EXPECT_TRUE(test, info);
+       KUNIT_EXPECT_TRUE(test, drm_format_info_block_width(info, 0));
+       KUNIT_EXPECT_TRUE(test, drm_format_info_block_width(info, 1));
+       KUNIT_EXPECT_TRUE(test, drm_format_info_block_width(info, 2));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, 3));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_block_width(info, -1));
+
+       /* Test a tiled format */
+       info = drm_format_info(DRM_FORMAT_X0L0);
+       KUNIT_EXPECT_TRUE(test, info);
+       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_FALSE(test, drm_format_info_block_width(info, -1));
+}
+
+static void igt_check_drm_format_block_height(struct kunit *test)
+{
+       const struct drm_format_info *info = NULL;
+
+       /* Test invalid arguments */
+       KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, -1));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, 1));
+
+       /* Test 1 plane format */
+       info = drm_format_info(DRM_FORMAT_XRGB4444);
+       KUNIT_EXPECT_TRUE(test, info);
+       KUNIT_EXPECT_TRUE(test, drm_format_info_block_height(info, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, -1));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, 1));
+
+       /* Test 2 planes format */
+       info = drm_format_info(DRM_FORMAT_NV12);
+       KUNIT_EXPECT_TRUE(test, info);
+       KUNIT_EXPECT_TRUE(test, drm_format_info_block_height(info, 0));
+       KUNIT_EXPECT_TRUE(test, drm_format_info_block_height(info, 1));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, 2));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, -1));
+
+       /* Test 3 planes format */
+       info = drm_format_info(DRM_FORMAT_YUV422);
+       KUNIT_EXPECT_TRUE(test, info);
+       KUNIT_EXPECT_TRUE(test, drm_format_info_block_height(info, 0));
+       KUNIT_EXPECT_TRUE(test, drm_format_info_block_height(info, 1));
+       KUNIT_EXPECT_TRUE(test, drm_format_info_block_height(info, 2));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, 3));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_block_height(info, -1));
+
+       /* Test a tiled format */
+       info = drm_format_info(DRM_FORMAT_X0L0);
+       KUNIT_EXPECT_TRUE(test, info);
+       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_FALSE(test, drm_format_info_block_height(info, -1));
+}
+
+static void igt_check_drm_format_min_pitch(struct kunit *test)
+{
+       const struct drm_format_info *info = NULL;
+
+       /* Test invalid arguments */
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 0));
+
+       /* Test 1 plane 8 bits per pixel format */
+       info = drm_format_info(DRM_FORMAT_RGB332);
+       KUNIT_EXPECT_TRUE(test, info);
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 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, 2), 2);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 640), 640);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1024), 1024);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1920), 1920);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 4096), 4096);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 671), 671);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, UINT_MAX),
+                       (uint64_t)UINT_MAX);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, (UINT_MAX - 1)),
+                       (uint64_t)(UINT_MAX - 1));
+
+       /* Test 1 plane 16 bits per pixel format */
+       info = drm_format_info(DRM_FORMAT_XRGB4444);
+       KUNIT_EXPECT_TRUE(test, info);
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 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, 2), 4);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 640), 1280);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1024), 2048);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1920), 3840);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 4096), 8192);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 671), 1342);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, UINT_MAX),
+                       (uint64_t)UINT_MAX * 2);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, (UINT_MAX - 1)),
+                       (uint64_t)(UINT_MAX - 1) * 2);
+
+       /* Test 1 plane 24 bits per pixel format */
+       info = drm_format_info(DRM_FORMAT_RGB888);
+       KUNIT_EXPECT_TRUE(test, info);
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 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, 2), 6);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 640), 1920);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1024), 3072);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1920), 5760);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 4096), 12288);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 671), 2013);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, UINT_MAX),
+                       (uint64_t)UINT_MAX * 3);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, (UINT_MAX - 1)),
+                       (uint64_t)(UINT_MAX - 1) * 3);
+
+       /* Test 1 plane 32 bits per pixel format */
+       info = drm_format_info(DRM_FORMAT_ABGR8888);
+       KUNIT_EXPECT_TRUE(test, info);
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 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, 2), 8);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 640), 2560);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1024), 4096);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1920), 7680);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 4096), 16384);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 671), 2684);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, UINT_MAX),
+                       (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);
+
+       /* Test 2 planes format */
+       info = drm_format_info(DRM_FORMAT_NV12);
+       KUNIT_EXPECT_TRUE(test, info);
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 2, 0));
+
+       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, 0, 2), 2);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 1), 2);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 640), 640);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 320), 640);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1024), 1024);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 512), 1024);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1920), 1920);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 960), 1920);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 4096), 4096);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 2048), 4096);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 671), 671);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 336), 672);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, UINT_MAX),
+                       (uint64_t)UINT_MAX);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, UINT_MAX / 2 + 1),
+                       (uint64_t)UINT_MAX + 1);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, (UINT_MAX - 1)),
+                       (uint64_t)(UINT_MAX - 1));
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, (UINT_MAX - 1) /  2),
+                       (uint64_t)(UINT_MAX - 1));
+
+       /* Test 3 planes 8 bits per pixel format */
+       info = drm_format_info(DRM_FORMAT_YUV422);
+       KUNIT_EXPECT_TRUE(test, info);
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 2, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 3, 0));
+
+       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, 2, 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, 1, 2), 2);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, 2), 2);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 640), 640);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 320), 320);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, 320), 320);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1024), 1024);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 512), 512);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, 512), 512);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1920), 1920);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 960), 960);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, 960), 960);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 4096), 4096);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 2048), 2048);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, 2048), 2048);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 671), 671);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, 336), 336);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, 336), 336);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, UINT_MAX),
+                       (uint64_t)UINT_MAX);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, UINT_MAX / 2 + 1),
+                       (uint64_t)UINT_MAX / 2 + 1);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 2, UINT_MAX / 2 + 1),
+                       (uint64_t)UINT_MAX / 2 + 1);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, (UINT_MAX - 1) / 2),
+                       (uint64_t)(UINT_MAX - 1) / 2);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 1, (UINT_MAX - 1) / 2),
+                       (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);
+
+       /* Test tiled format */
+       info = drm_format_info(DRM_FORMAT_X0L2);
+       KUNIT_EXPECT_TRUE(test, info);
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 0, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, -1, 0));
+       KUNIT_EXPECT_FALSE(test, drm_format_info_min_pitch(info, 1, 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, 2), 4);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 640), 1280);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1024), 2048);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 1920), 3840);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 4096), 8192);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, 671), 1342);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, UINT_MAX),
+                       (uint64_t)UINT_MAX * 2);
+       KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, UINT_MAX - 1),
+                       (uint64_t)(UINT_MAX - 1) * 2);
+}
+
+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),
+       { }
+};
+
+static struct kunit_suite drm_format_test_suite = {
+       .name = "drm_format",
+       .test_cases = drm_format_tests,
+};
+
+kunit_test_suite(drm_format_test_suite);
+
+MODULE_LICENSE("GPL");