Hi Swati,
Add test cases where we are validating force dsc and force
joiner.
v2: -fix if() for ultra/big joiner (Ankit)
v3: -Add '-' separator in subtest names when using
igt_get_joined_pipes_name (Santhosh)
v4: -Use 'enum joined_pipes force_joined_pipes' in data_t (Ankit)
-Use dsc-basic-%s format for subtest names (Ankit)
-Use igt_crtc_for_pipe() to check consecutive HW pipes,
handling fused pipe holes properly (Ankit)
v5: -Use igt_display_n_crtcs() instead of open-coded
for_each_crtc counting loop (Jani)
Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
---
tests/intel/kms_dsc.c | 203 +++++++++++++++++++++++++++---------------
1 file changed, 131 insertions(+), 72 deletions(-)
diff --git a/tests/intel/kms_dsc.c b/tests/intel/kms_dsc.c
index 69f335da3..9a19de1c4 100644
--- a/tests/intel/kms_dsc.c
+++ b/tests/intel/kms_dsc.c
@@ -55,7 +55,27 @@
* @with-output-formats-with-bpc: DSC with output formats with certain input BPC for the connector
* @fractional-bpp: DSC with fractional bpp with default parameters
* @fractional-bpp-with-bpc: DSC with fractional bpp with certain input BPC for the connector
- */
+ *
+ * SUBTEST: dsc-%s-%s
+ * Description: Tests Display Stream Compression functionality if supported by a
+ * connector by forcing %arg[1] and %arg[2] on all connectors that support it
+ *
IMHO, better to call out the default/existing tests as non-joiner to avoid any confusion.
May be we could have something like this:
+ * arg[1]:
+ *
+ * @basic: DSC with default parameters
+ * @with-bpc: DSC with certain input BPC for the connector
+ * @with-bpc-formats: DSC with certain input BPC for the connector and diff formats
+ * @with-formats: DSC with default parameters and creating fb with diff formats
+ * @with-output-formats: DSC with output formats
+ * @with-output-formats-with-bpc: DSC with output formats with certain input BPC for the connector
+ * @fractional-bpp: DSC with fractional bpp with default parameters
+ * @fractional-bpp-with-bpc: DSC with fractional bpp with certain input BPC for the connector
+ *
+ * arg[2]:
+ *
+ * @bigjoiner: big joiner
+ * @ultrajoiner: ultra joiner
+*/
IGT_TEST_DESCRIPTION("Test to validate display stream compression");
@@ -81,11 +101,13 @@ typedef struct {
int disp_ver;
igt_crtc_t *crtc;
bool limited;
+ enum joined_pipes force_joined_pipes;
} data_t;
static int output_format_list[] = {DSC_FORMAT_YCBCR420, DSC_FORMAT_YCBCR444};
static int format_list[] = {DRM_FORMAT_XYUV8888, DRM_FORMAT_XRGB2101010, DRM_FORMAT_XRGB16161616F, DRM_FORMAT_YUYV};
static uint32_t bpc_list[] = {8, 10, 12};
+static enum joined_pipes joiner_tests[] = {JOINED_PIPES_DEFAULT, JOINED_PIPES_BIG_JOINER, JOINED_PIPES_ULTRA_JOINER};
static inline void manual(const char *expected)
{
@@ -135,6 +157,7 @@ static void update_display(data_t *data, uint32_t test_type)
int current_bpc = 0;
igt_plane_t *primary;
drmModeModeInfo *mode;
+ bool status;
igt_output_t *output = data->output;
igt_display_t *display = &data->display;
drmModeConnector *connector = output->config.connector;
@@ -147,6 +170,11 @@ static void update_display(data_t *data, uint32_t test_type)
save_force_dsc_en(data->drm_fd, data->output);
force_dsc_enable(data->drm_fd, data->output);
+ if (data->force_joined_pipes == JOINED_PIPES_BIG_JOINER || data->force_joined_pipes == JOINED_PIPES_ULTRA_JOINER) {
+ status = kmstest_force_connector_joiner(data->drm_fd, connector, data->force_joined_pipes);
+ igt_assert_f(status, "Failed to toggle force joiner\n");
+ }
+
There seem to be few more issues with checkpatch here, mostly the
LONG_LINE which is okay if unavoidable but I feel in most places it
could be handled here. So please check.
if (test_type & TEST_DSC_BPC) {
igt_debug("Trying to set input BPC to %d\n", data->input_bpc);
force_dsc_enable_bpc(data->drm_fd, data->output, data->input_bpc);
@@ -246,11 +274,13 @@ reset:
static void test_dsc(data_t *data, uint32_t test_type, int bpc,
unsigned int plane_format,
- enum dsc_output_format output_format)
+ enum dsc_output_format output_format,
+ enum joined_pipes joined_pipes)
{
igt_display_t *display = &data->display;
igt_output_t *output;
igt_crtc_t *crtc;
+ int n_pipes = igt_display_n_crtcs(display);
char name[3][LEN] = {
{0},
{0},
@@ -259,12 +289,17 @@ static void test_dsc(data_t *data, uint32_t test_type, int bpc,
igt_require(check_gen11_bpc_constraint(data->drm_fd, data->input_bpc));
+ if (joined_pipes != JOINED_PIPES_DEFAULT &&
+ !igt_is_joiner_supported_by_source(data->drm_fd, joined_pipes))
+ return;
+
for_each_crtc_with_valid_output(display, crtc, output) {
data->output_format = output_format;
data->plane_format = plane_format;
data->input_bpc = bpc;
data->output = output;
data->crtc = crtc;
+ data->force_joined_pipes = joined_pipes;
if (!is_dsc_supported_by_sink(data->drm_fd, data->output) ||
!check_gen11_dp_constraint(data->drm_fd, data->output, data->crtc))
@@ -285,6 +320,26 @@ static void test_dsc(data_t *data, uint32_t test_type, int bpc,
data->drm_fd, data->output)))
continue;
+ /*
+ * Check joiner constraints and verify that we have
+ * enough consecutive HW pipes starting from this crtc.
+ * Use igt_crtc_for_pipe() to handle fused pipe holes.
+ */
+ if (joined_pipes != JOINED_PIPES_DEFAULT &&
+ !check_dsc_joiner_constraints(data->drm_fd, data->output,
+ n_pipes, joined_pipes))
+ continue;
+
+ if (joined_pipes == JOINED_PIPES_BIG_JOINER &&
+ !igt_crtc_for_pipe(display, crtc->pipe + 1))
+ continue;
+
+ if (joined_pipes == JOINED_PIPES_ULTRA_JOINER &&
+ (!igt_crtc_for_pipe(display, crtc->pipe + 1) ||
+ !igt_crtc_for_pipe(display, crtc->pipe + 2) ||
+ !igt_crtc_for_pipe(display, crtc->pipe + 3)))
+ continue;
Could this be added in the joiner helper rather than having it specific to test?
Thanks and Regards,
+
if (test_type & TEST_DSC_OUTPUT_FORMAT)
snprintf(&name[0][0], LEN, "-%s", kmstest_dsc_output_format_str(data->output_format));
if (test_type & TEST_DSC_FORMAT)
@@ -334,85 +389,89 @@ int igt_main_args("l", NULL, help_str, opt_handler, &data)
igt_require(is_dsc_supported_by_source(data.drm_fd));
}
- igt_describe("Tests basic display stream compression functionality if supported "
- "by a connector by forcing DSC on all connectors that support it "
- "with default parameters");
- igt_subtest_with_dynamic("dsc-basic")
- test_dsc(&data, TEST_DSC_BASIC, DEFAULT_BPC,
- DRM_FORMAT_XRGB8888, DSC_FORMAT_RGB);
-
- igt_describe("Tests basic display stream compression functionality if supported "
- "by a connector by forcing DSC on all connectors that support it "
- "with default parameters and creating fb with diff formats");
- igt_subtest_with_dynamic("dsc-with-formats") {
- for (int k = 0; k < ARRAY_SIZE(format_list); k++)
- test_dsc(&data, TEST_DSC_FORMAT, DEFAULT_BPC,
- format_list[k], DSC_FORMAT_RGB);
- }
- igt_describe("Tests basic display stream compression functionality if supported "
- "by a connector by forcing DSC on all connectors that support it "
- "with certain input BPC for the connector");
- igt_subtest_with_dynamic("dsc-with-bpc") {
- for (int j = 0; j < ARRAY_SIZE(bpc_list); j++)
- test_dsc(&data, TEST_DSC_BPC, bpc_list[j],
- DRM_FORMAT_XRGB8888, DSC_FORMAT_RGB);
- }
+ for (int i = 0; i < ARRAY_SIZE(joiner_tests) ; i++) {
+ igt_describe("Tests basic display stream compression functionality if supported "
+ "by a connector by forcing DSC on all connectors that support it "
+ "with default parameters");
+ igt_subtest_with_dynamic_f("dsc-basic%s%s", joiner_tests[i] ? "-" : "", igt_get_joined_pipes_name(joiner_tests[i])) {
+ test_dsc(&data, TEST_DSC_BASIC, DEFAULT_BPC,
+ DRM_FORMAT_XRGB8888, DSC_FORMAT_RGB, joiner_tests[i]);
+ }
- igt_describe("Tests basic display stream compression functionality if supported "
- "by a connector by forcing DSC on all connectors that support it "
- "with certain input BPC for the connector with diff formats");
- igt_subtest_with_dynamic("dsc-with-bpc-formats") {
- for (int j = 0; j < ARRAY_SIZE(bpc_list); j++) {
- for (int k = 0; k < ARRAY_SIZE(format_list); k++) {
- test_dsc(&data, TEST_DSC_BPC | TEST_DSC_FORMAT,
- bpc_list[j], format_list[k],
- DSC_FORMAT_RGB);
- }
+ igt_describe("Tests basic display stream compression functionality if supported "
+ "by a connector by forcing DSC on all connectors that support it "
+ "with default parameters and creating fb with diff formats");
+ igt_subtest_with_dynamic_f("dsc-with-formats%s%s", joiner_tests[i] ? "-" : "", igt_get_joined_pipes_name(joiner_tests[i])) {
+ for (int k = 0; k < ARRAY_SIZE(format_list); k++)
+ test_dsc(&data, TEST_DSC_FORMAT, DEFAULT_BPC,
+ format_list[k], DSC_FORMAT_RGB, joiner_tests[i]);
}
- }
- igt_describe("Tests basic display stream compression functionality if supported "
- "by a connector by forcing DSC and output format on all connectors "
- "that support it");
- igt_subtest_with_dynamic("dsc-with-output-formats") {
- for (int k = 0; k < ARRAY_SIZE(output_format_list); k++)
- test_dsc(&data, TEST_DSC_OUTPUT_FORMAT, DEFAULT_BPC,
- DRM_FORMAT_XRGB8888,
- output_format_list[k]);
- }
+ igt_describe("Tests basic display stream compression functionality if supported "
+ "by a connector by forcing DSC on all connectors that support it "
+ "with certain input BPC for the connector");
+ igt_subtest_with_dynamic_f("dsc-with-bpc%s%s", joiner_tests[i] ? "-" : "", igt_get_joined_pipes_name(joiner_tests[i])) {
+ for (int j = 0; j < ARRAY_SIZE(bpc_list); j++)
+ test_dsc(&data, TEST_DSC_BPC, bpc_list[j],
+ DRM_FORMAT_XRGB8888, DSC_FORMAT_RGB, joiner_tests[i]);
+ }
- igt_describe("Tests basic display stream compression functionality if supported "
- "by a connector by forcing DSC and output format on all connectors "
- "that support it with certain input BPC for the connector");
- igt_subtest_with_dynamic("dsc-with-output-formats-with-bpc") {
- for (int k = 0; k < ARRAY_SIZE(output_format_list); k++) {
+ igt_describe("Tests basic display stream compression functionality if supported "
+ "by a connector by forcing DSC on all connectors that support it "
+ "with certain input BPC for the connector with diff formats");
+ igt_subtest_with_dynamic_f("dsc-with-bpc-formats%s%s", joiner_tests[i] ? "-" : "", igt_get_joined_pipes_name(joiner_tests[i])) {
for (int j = 0; j < ARRAY_SIZE(bpc_list); j++) {
- test_dsc(&data, TEST_DSC_OUTPUT_FORMAT | TEST_DSC_BPC,
- bpc_list[j], DRM_FORMAT_XRGB8888,
- output_format_list[k]);
+ for (int k = 0; k < ARRAY_SIZE(format_list); k++) {
+ test_dsc(&data, TEST_DSC_BPC | TEST_DSC_FORMAT,
+ bpc_list[j], format_list[k],
+ DSC_FORMAT_RGB, joiner_tests[i]);
+ }
}
}
- }
- igt_describe("Tests fractional compressed bpp functionality if supported "
- "by a connector by forcing fractional_bpp on all connectors that support it "
- "with default parameter. While finding the optimum compressed bpp, driver will "
- "skip over the compressed bpps with integer values. It will go ahead with DSC, "
- "iff compressed bpp is fractional, failing in which, it will fail the commit.");
- igt_subtest_with_dynamic("dsc-fractional-bpp")
- test_dsc(&data, TEST_DSC_FRACTIONAL_BPP,
- DEFAULT_BPC, DRM_FORMAT_XRGB8888,
- DSC_FORMAT_RGB);
-
- igt_describe("Tests fractional compressed bpp functionality if supported "
- "by a connector by forcing fractional_bpp on all connectors that support it "
- "with certain input BPC for the connector.");
- igt_subtest_with_dynamic("dsc-fractional-bpp-with-bpc") {
- for (int j = 0; j < ARRAY_SIZE(bpc_list); j++)
- test_dsc(&data, TEST_DSC_FRACTIONAL_BPP | TEST_DSC_BPC,
- bpc_list[j], DRM_FORMAT_XRGB8888,
- DSC_FORMAT_RGB);
+ igt_describe("Tests basic display stream compression functionality if supported "
+ "by a connector by forcing DSC and output format on all connectors "
+ "that support it");
+ igt_subtest_with_dynamic_f("dsc-with-output-formats%s%s", joiner_tests[i] ? "-" : "", igt_get_joined_pipes_name(joiner_tests[i])) {
+ for (int k = 0; k < ARRAY_SIZE(output_format_list); k++)
+ test_dsc(&data, TEST_DSC_OUTPUT_FORMAT, DEFAULT_BPC,
+ DRM_FORMAT_XRGB8888,
+ output_format_list[k], joiner_tests[i]);
+ }
+
+ igt_describe("Tests basic display stream compression functionality if supported "
+ "by a connector by forcing DSC and output format on all connectors "
+ "that support it with certain input BPC for the connector");
+ igt_subtest_with_dynamic_f("dsc-with-output-formats-with-bpc%s%s", joiner_tests[i] ? "-" : "", igt_get_joined_pipes_name(joiner_tests[i])) {
+ for (int k = 0; k < ARRAY_SIZE(output_format_list); k++) {
+ for (int j = 0; j < ARRAY_SIZE(bpc_list); j++) {
+ test_dsc(&data, TEST_DSC_OUTPUT_FORMAT | TEST_DSC_BPC,
+ bpc_list[j], DRM_FORMAT_XRGB8888,
+ output_format_list[k], joiner_tests[i]);
+ }
+ }
+ }
+
+ igt_describe("Tests fractional compressed bpp functionality if supported "
+ "by a connector by forcing fractional_bpp on all connectors that support it "
+ "with default parameter. While finding the optimum compressed bpp, driver will "
+ "skip over the compressed bpps with integer values. It will go ahead with DSC, "
+ "iff compressed bpp is fractional, failing in which, it will fail the commit.");
+ igt_subtest_with_dynamic_f("dsc-fractional-bpp%s%s", joiner_tests[i] ? "-" : "", igt_get_joined_pipes_name(joiner_tests[i]))
+ test_dsc(&data, TEST_DSC_FRACTIONAL_BPP,
+ DEFAULT_BPC, DRM_FORMAT_XRGB8888,
+ DSC_FORMAT_RGB, joiner_tests[i]);
+
+ igt_describe("Tests fractional compressed bpp functionality if supported "
+ "by a connector by forcing fractional_bpp on all connectors that support it "
+ "with certain input BPC for the connector.");
+ igt_subtest_with_dynamic_f("dsc-fractional-bpp-with-bpc%s%s", joiner_tests[i] ? "-" : "", igt_get_joined_pipes_name(joiner_tests[i])) {
+ for (int j = 0; j < ARRAY_SIZE(bpc_list); j++)
+ test_dsc(&data, TEST_DSC_FRACTIONAL_BPP | TEST_DSC_BPC,
+ bpc_list[j], DRM_FORMAT_XRGB8888,
+ DSC_FORMAT_RGB, joiner_tests[i]);
+ }
}
igt_fixture() {