diff mbox series

[v4,02/25] drm/tests: Add test for drm_crtc_in_clone_mode()

Message ID 20241216-concurrent-wb-v4-2-fe220297a7f0@quicinc.com (mailing list archive)
State New
Headers show
Series drm/msm/dpu: Add Concurrent Writeback Support for DPU 10.x+ | expand

Commit Message

Jessica Zhang Dec. 17, 2024, 12:43 a.m. UTC 
Add kunit test to validate drm_crtc_in_clone_mode() helper

Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com>
---
 drivers/gpu/drm/tests/drm_atomic_state_test.c | 62 ++++++++++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

Comments

Abhinav Kumar Dec. 17, 2024, 2:06 a.m. UTC | #1 
On 12/16/2024 4:43 PM, Jessica Zhang wrote:
> Add kunit test to validate drm_crtc_in_clone_mode() helper
> 
> Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com>
> ---
>   drivers/gpu/drm/tests/drm_atomic_state_test.c | 62 ++++++++++++++++++++++++++-
>   1 file changed, 61 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/tests/drm_atomic_state_test.c b/drivers/gpu/drm/tests/drm_atomic_state_test.c
> index be1f780249450ead7fbfd19ea98c96b442a94478..79bc5a9aedbf77aaf4b369a5fe62b6344e6859cf 100644
> --- a/drivers/gpu/drm/tests/drm_atomic_state_test.c
> +++ b/drivers/gpu/drm/tests/drm_atomic_state_test.c
> @@ -17,6 +17,12 @@
>   
>   #define DRM_TEST_CONN_0 BIT(0)
>   
> +struct drm_clone_mode_test {
> +	const char *name;
> +	u32 encoder_mask;
> +	int expected_result;
> +};
> +
>   static const struct drm_display_mode drm_atomic_test_mode = {
>   	DRM_MODE("1024x768", 0, 65000, 1024, 1048,
>   		 1184, 1344, 0, 768, 771, 777, 806, 0,
> @@ -227,17 +233,71 @@ static void drm_test_check_connector_changed_modeset(struct kunit *test)
>   	KUNIT_ASSERT_EQ(test, modeset_counter, initial_modeset_count + 1);
>   }
>   
> +/*
> + * Test that the drm_crtc_in_clone_mode() helper can detect if a given CRTC
> + * state is in clone mode
> + */
> +static void drm_test_check_in_clone_mode(struct kunit *test)
> +{
> +	bool ret;
> +	const struct drm_clone_mode_test *param = test->param_value;
> +	struct drm_crtc_state *crtc_state;
> +
> +	crtc_state = kunit_kzalloc(test, sizeof(*crtc_state), GFP_KERNEL);
> +	KUNIT_ASSERT_NOT_NULL(test, crtc_state);
> +
> +	crtc_state->encoder_mask = param->encoder_mask;
> +
> +	ret = drm_crtc_in_clone_mode(crtc_state);
> +
> +	KUNIT_ASSERT_EQ(test, ret, param->expected_result);
> +}
> +
> +static void drm_check_in_clone_mode_desc(const struct drm_clone_mode_test *t,
> +				      char *desc)
> +{
> +	sprintf(desc, "%s", t->name);
> +}
> +
> +static const struct drm_clone_mode_test drm_clone_mode_tests[] = {
> +	{
> +		.name = "in_clone_mode",
> +		.encoder_mask = DRM_TEST_ENC_0 | DRM_TEST_ENC_1,
> +		.expected_result = true,
> +	},
> +	{
> +		.name = "not_in_clone_mode",
> +		.encoder_mask = DRM_TEST_ENC_0,
> +		.expected_result = false,
> +	},
> +};

I think now, this series also depends on 
https://patchwork.kernel.org/project/dri-devel/list/?series=916960 for 
these ENC defines. Please indicate it in the cover letter and if we get 
an ack to merge it through msm tree, we can absorb in in this series itself.

LGTM otherwise,

Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>

> +
> +KUNIT_ARRAY_PARAM(drm_check_in_clone_mode, drm_clone_mode_tests,
> +		  drm_check_in_clone_mode_desc);
> +
>   static struct kunit_case drm_test_check_modeset_test[] = {
>   	KUNIT_CASE(drm_test_check_connector_changed_modeset),
>   	{}
>   };
>   
> +static struct kunit_case drm_in_clone_mode_check_test[] = {
> +	KUNIT_CASE_PARAM(drm_test_check_in_clone_mode,
> +			 drm_check_in_clone_mode_gen_params),
> +	{}
> +};
> +
>   static struct kunit_suite drm_test_check_modeset_test_suite = {
>   	.name = "drm_validate_modeset",
>   	.test_cases = drm_test_check_modeset_test,
>   };
>   
> -kunit_test_suite(drm_test_check_modeset_test_suite);
> +static struct kunit_suite drm_in_clone_mode_check_test_suite = {
> +	.name = "drm_validate_clone_mode",
> +	.test_cases = drm_in_clone_mode_check_test,
> +};
> +
> +kunit_test_suites(&drm_in_clone_mode_check_test_suite,
> +		  &drm_test_check_modeset_test_suite);
>   
>   MODULE_AUTHOR("Jessica Zhang <quic_jesszhan@quicinc.com");
>   MODULE_DESCRIPTION("Test cases for the drm_atomic_helper functions");
>
Maxime Ripard Dec. 17, 2024, 5:17 p.m. UTC | #2 
On Mon, 16 Dec 2024 16:43:13 -0800, Jessica Zhang wrote:
> Add kunit test to validate drm_crtc_in_clone_mode() helper
> 
> Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com>

Reviewed-by: Maxime Ripard <mripard@kernel.org>

Thanks!
Maxime
diff mbox series

Patch

diff --git a/drivers/gpu/drm/tests/drm_atomic_state_test.c b/drivers/gpu/drm/tests/drm_atomic_state_test.c
index be1f780249450ead7fbfd19ea98c96b442a94478..79bc5a9aedbf77aaf4b369a5fe62b6344e6859cf 100644
--- a/drivers/gpu/drm/tests/drm_atomic_state_test.c
+++ b/drivers/gpu/drm/tests/drm_atomic_state_test.c
@@ -17,6 +17,12 @@ 
 
 #define DRM_TEST_CONN_0 BIT(0)
 
+struct drm_clone_mode_test {
+	const char *name;
+	u32 encoder_mask;
+	int expected_result;
+};
+
 static const struct drm_display_mode drm_atomic_test_mode = {
 	DRM_MODE("1024x768", 0, 65000, 1024, 1048,
 		 1184, 1344, 0, 768, 771, 777, 806, 0,
@@ -227,17 +233,71 @@  static void drm_test_check_connector_changed_modeset(struct kunit *test)
 	KUNIT_ASSERT_EQ(test, modeset_counter, initial_modeset_count + 1);
 }
 
+/*
+ * Test that the drm_crtc_in_clone_mode() helper can detect if a given CRTC
+ * state is in clone mode
+ */
+static void drm_test_check_in_clone_mode(struct kunit *test)
+{
+	bool ret;
+	const struct drm_clone_mode_test *param = test->param_value;
+	struct drm_crtc_state *crtc_state;
+
+	crtc_state = kunit_kzalloc(test, sizeof(*crtc_state), GFP_KERNEL);
+	KUNIT_ASSERT_NOT_NULL(test, crtc_state);
+
+	crtc_state->encoder_mask = param->encoder_mask;
+
+	ret = drm_crtc_in_clone_mode(crtc_state);
+
+	KUNIT_ASSERT_EQ(test, ret, param->expected_result);
+}
+
+static void drm_check_in_clone_mode_desc(const struct drm_clone_mode_test *t,
+				      char *desc)
+{
+	sprintf(desc, "%s", t->name);
+}
+
+static const struct drm_clone_mode_test drm_clone_mode_tests[] = {
+	{
+		.name = "in_clone_mode",
+		.encoder_mask = DRM_TEST_ENC_0 | DRM_TEST_ENC_1,
+		.expected_result = true,
+	},
+	{
+		.name = "not_in_clone_mode",
+		.encoder_mask = DRM_TEST_ENC_0,
+		.expected_result = false,
+	},
+};
+
+KUNIT_ARRAY_PARAM(drm_check_in_clone_mode, drm_clone_mode_tests,
+		  drm_check_in_clone_mode_desc);
+
 static struct kunit_case drm_test_check_modeset_test[] = {
 	KUNIT_CASE(drm_test_check_connector_changed_modeset),
 	{}
 };
 
+static struct kunit_case drm_in_clone_mode_check_test[] = {
+	KUNIT_CASE_PARAM(drm_test_check_in_clone_mode,
+			 drm_check_in_clone_mode_gen_params),
+	{}
+};
+
 static struct kunit_suite drm_test_check_modeset_test_suite = {
 	.name = "drm_validate_modeset",
 	.test_cases = drm_test_check_modeset_test,
 };
 
-kunit_test_suite(drm_test_check_modeset_test_suite);
+static struct kunit_suite drm_in_clone_mode_check_test_suite = {
+	.name = "drm_validate_clone_mode",
+	.test_cases = drm_in_clone_mode_check_test,
+};
+
+kunit_test_suites(&drm_in_clone_mode_check_test_suite,
+		  &drm_test_check_modeset_test_suite);
 
 MODULE_AUTHOR("Jessica Zhang <quic_jesszhan@quicinc.com");
 MODULE_DESCRIPTION("Test cases for the drm_atomic_helper functions");