~lkcamp/patches

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch

[PATCH] drm: selftest: convert drm_format selftest to KUnit

Maíra Canal <maira.canal@usp.br>
Details
Message ID
<YfVne668O6BtpHVx@fedora>
DKIM signature
missing
Download raw message
Patch: +210 -199
Considering the current adoption of the KUnit framework, convert the
DRM format selftest to the KUnit API.

Signed-off-by: Maíra Canal <maira.canal@usp.br>
---
 drivers/gpu/drm/Kconfig                       |  13 +
 drivers/gpu/drm/selftests/Makefile            |   5 +-
 .../gpu/drm/selftests/drm_modeset_selftests.h |   3 -
 drivers/gpu/drm/selftests/test-drm_format.c   | 385 +++++++++---------
 .../drm/selftests/test-drm_modeset_common.h   |   3 -
 5 files changed, 210 insertions(+), 199 deletions(-)

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 56f6ca74ebb6..8f77fbc9d116 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -92,6 +92,19 @@ config DRM_DAMAGE_HELPER_KUNIT_TEST

	  If in doubt, say "N".

config DRM_FORMAT_KUNIT_TEST
	tristate "KUnit tests for DRM format"
	depends on DRM && KUNIT
	select DRM_KMS_HELPER
	default KUNIT_ALL_TESTS
	help
	  This option provides a KUnit module that can be used to run
	  an unit test on the DRM format API. This option is not
	  useful for distributions or general kernels, but only for kernel
	  developers working on DRM and associated drivers.

	  If in doubt, say "N".

config DRM_KMS_HELPER
	tristate
	depends on DRM
diff --git a/drivers/gpu/drm/selftests/Makefile b/drivers/gpu/drm/selftests/Makefile
index 311f6af2caf1..a8c7f02e67ee 100644
--- a/drivers/gpu/drm/selftests/Makefile
+++ b/drivers/gpu/drm/selftests/Makefile
@@ -1,8 +1,9 @@
# 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_rect.o
                      test-drm_framebuffer.o test-drm_dp_mst_helper.o \
					  test-drm_rect.o

obj-$(CONFIG_DRM_DEBUG_SELFTEST) += test-drm_mm.o test-drm_modeset.o test-drm_cmdline_parser.o

obj-$(CONFIG_DRM_DAMAGE_HELPER_KUNIT_TEST) += test-drm_damage_helper.o
obj-$(CONFIG_DRM_FORMAT_KUNIT_TEST) += test-drm_format.o
diff --git a/drivers/gpu/drm/selftests/drm_modeset_selftests.h b/drivers/gpu/drm/selftests/drm_modeset_selftests.h
index 4787b3b70709..275992679c05 100644
--- a/drivers/gpu/drm/selftests/drm_modeset_selftests.h
+++ b/drivers/gpu/drm/selftests/drm_modeset_selftests.h
@@ -11,9 +11,6 @@ selftest(drm_rect_clip_scaled_not_clipped, igt_drm_rect_clip_scaled_not_clipped)
selftest(drm_rect_clip_scaled_clipped, igt_drm_rect_clip_scaled_clipped)
selftest(drm_rect_clip_scaled_signed_vs_unsigned, igt_drm_rect_clip_scaled_signed_vs_unsigned)
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
index c5e212afa27a..ea390a84b3b1 100644
--- a/drivers/gpu/drm/selftests/test-drm_format.c
+++ b/drivers/gpu/drm/selftests/test-drm_format.c
@@ -3,278 +3,281 @@
 * Test cases for the drm_format functions
 */

#define pr_fmt(fmt) "drm_format: " fmt

#include <linux/errno.h>
#include <linux/kernel.h>

#include <kunit/test.h>
#include <drm/drm_fourcc.h>

#include "test-drm_modeset_common.h"

int igt_check_drm_format_block_width(void *ignored)
static void igt_check_drm_format_block_width(struct kunit *test)
{
	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);
	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);
	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);
	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);
	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);
	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);
	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);
	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);
	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;
	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));
}

int igt_check_drm_format_block_height(void *ignored)
static void igt_check_drm_format_block_height(struct kunit *test)
{
	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);
	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);
	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);
	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);
	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);
	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);
	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);
	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);
	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;
	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));
}

int igt_check_drm_format_min_pitch(void *ignored)
static void igt_check_drm_format_min_pitch(struct kunit *test)
{
	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);
	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);
	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) !=
	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);
	FAIL_ON(drm_format_info_min_pitch(info, 0, (UINT_MAX - 1)) !=
	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);
	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) !=
	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);
	FAIL_ON(drm_format_info_min_pitch(info, 0, (UINT_MAX - 1)) !=
	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);
	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) !=
	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);
	FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX - 1) !=
	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);
	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) !=
	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);
	FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX - 1) !=
	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);
	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) !=
	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);
	FAIL_ON(drm_format_info_min_pitch(info, 1, UINT_MAX / 2 + 1) !=
	KUNIT_EXPECT_EQ(test, 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)) !=
	KUNIT_EXPECT_EQ(test, 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) !=
	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);
	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) !=
	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);
	FAIL_ON(drm_format_info_min_pitch(info, 1, UINT_MAX / 2 + 1) !=
	KUNIT_EXPECT_EQ(test, 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) !=
	KUNIT_EXPECT_EQ(test, 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) !=
	KUNIT_EXPECT_EQ(test, 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) !=
	KUNIT_EXPECT_EQ(test, 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) !=
	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);
	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) !=
	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);
	FAIL_ON(drm_format_info_min_pitch(info, 0, UINT_MAX - 1) !=
	KUNIT_EXPECT_EQ(test, drm_format_info_min_pitch(info, 0, UINT_MAX - 1),
			(uint64_t)(UINT_MAX - 1) * 2);

	return 0;
}

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_tests",
	.test_cases = drm_format_tests,
};

kunit_test_suite(drm_format_test_suite);

diff --git a/drivers/gpu/drm/selftests/test-drm_modeset_common.h b/drivers/gpu/drm/selftests/test-drm_modeset_common.h
index cfb51d8da2bc..e9a5bdf46a1e 100644
--- a/drivers/gpu/drm/selftests/test-drm_modeset_common.h
+++ b/drivers/gpu/drm/selftests/test-drm_modeset_common.h
@@ -21,9 +21,6 @@ int igt_drm_rect_clip_scaled_not_clipped(void *ignored);
int igt_drm_rect_clip_scaled_clipped(void *ignored);
int igt_drm_rect_clip_scaled_signed_vs_unsigned(void *ignored);
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_damage_iter_no_damage(void *ignored);
int igt_damage_iter_no_damage_fractional_src(void *ignored);
-- 
2.34.1
Reply to thread Export thread (mbox)