From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by gabe.freedesktop.org (Postfix) with ESMTPS id 82E5610E149 for ; Tue, 21 Feb 2023 18:26:04 +0000 (UTC) From: hersen wu To: , , , Date: Tue, 21 Feb 2023 13:25:57 -0500 Message-ID: <20230221182557.725785-1-hersenxs.wu@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Subject: [igt-dev] [PATCH] [i-g-t] tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: hersen wu Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: pipe is valid with display->pipes[i].enable be true when i is within [0, n_outputs). working on invalid pipe, will cause assert and let test be skipped. Signed-off-by: hersen wu --- tests/amdgpu/amd_dp_dsc.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/amdgpu/amd_dp_dsc.c b/tests/amdgpu/amd_dp_dsc.c index e6b5a43b..a950789c 100644 --- a/tests/amdgpu/amd_dp_dsc.c +++ b/tests/amdgpu/amd_dp_dsc.c @@ -49,7 +49,7 @@ static void test_fini(data_t *data) igt_display_t *display = &data->display; int i; - for (i = 0; i < display->n_pipes; ++i) { + for_each_pipe(display, i) { igt_pipe_crc_free(data->pipe_crc[i]); } @@ -61,19 +61,19 @@ static void test_fini(data_t *data) static void test_init(data_t *data) { igt_display_t *display = &data->display; - int i, n; + int i, n, max_pipes = display->n_pipes; - for (i = 0; i < display->n_pipes; ++i) { + for_each_pipe(display, i) { data->pipe_id[i] = PIPE_A + i; data->pipe[i] = &data->display.pipes[data->pipe_id[i]]; data->primary[i] = igt_pipe_get_plane_type( data->pipe[i], DRM_PLANE_TYPE_PRIMARY); data->pipe_crc[i] = - igt_pipe_crc_new(data->fd, data->pipe_id[i], - IGT_PIPE_CRC_SOURCE_AUTO); + igt_pipe_crc_new(data->fd, data->pipe_id[i], + IGT_PIPE_CRC_SOURCE_AUTO); } - for (i = 0, n = 0; i < display->n_outputs && n < display->n_pipes; ++i) { + for (i = 0, n = 0; i < display->n_outputs && n < max_pipes; ++i) { igt_output_t *output = &display->outputs[i]; data->output[n] = output; @@ -110,7 +110,7 @@ static void test_dsc_enable(data_t *data) test_init(data); igt_enable_connectors(data->fd); - for (i = 0; i < display->n_pipes; i++) { + for (i = 0; i < display->n_outputs; i++) { /* Setup the output */ output = data->output[i]; if (!output || !igt_output_is_connected(output)) @@ -248,7 +248,7 @@ static void test_dsc_slice_dimensions_change(data_t *data) test_init(data); igt_enable_connectors(data->fd); - for (i = 0; i < display->n_pipes; i++) { + for (i = 0; i < display->n_outputs; i++) { /* Setup the output */ output = data->output[i]; if (!output || !igt_output_is_connected(output)) @@ -341,7 +341,7 @@ static void test_dsc_link_settings(data_t *data) test_init(data); /* Setup all outputs */ - for (i = 0; i < display->n_pipes; i++) { + for (i = 0; i < display->n_outputs; i++) { output = data->output[i]; if (!output || !igt_output_is_connected(output)) continue; @@ -358,7 +358,7 @@ static void test_dsc_link_settings(data_t *data) igt_display_commit_atomic(display, DRM_MODE_ATOMIC_ALLOW_MODESET, 0); /* Collect reference CRCs */ - for (i = 0; i < display->n_pipes; i++) { + for (i = 0; i < display->n_outputs; i++) { output = data->output[i]; if (!output || !igt_output_is_connected(output)) continue; @@ -369,7 +369,7 @@ static void test_dsc_link_settings(data_t *data) for (lc = 0; lc < ARRAY_SIZE(lane_count_vals); lc++) { for (lr = 0; lr < ARRAY_SIZE(link_rate_vals); lr++) { /* Write new link_settings */ - for (i = 0; i < display->n_pipes; i++) { + for (i = 0; i < display->n_outputs; i++) { output = data->output[i]; if (!output || !igt_output_is_connected(output)) continue; @@ -387,7 +387,7 @@ static void test_dsc_link_settings(data_t *data) /* Trigger commit after writing new link settings */ igt_display_commit_atomic(display, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL); - for (i = 0; i < display->n_pipes; i++) { + for (i = 0; i < display->n_outputs; i++) { output = data->output[i]; if (!output || !igt_output_is_connected(output)) continue; @@ -416,7 +416,7 @@ static void test_dsc_link_settings(data_t *data) } /* Cleanup all fbs */ - for (i = 0; i < display->n_pipes; i++) { + for (i = 0; i < display->n_outputs; i++) { output = data->output[i]; if (!output || !igt_output_is_connected(output)) continue; @@ -439,7 +439,7 @@ static void test_dsc_bpc(data_t *data) test_init(data); /* Find max supported bpc */ - for (i = 0; i < display->n_pipes; i++) { + for (i = 0; i < display->n_outputs; i++) { output = data->output[i]; if (!output || !igt_output_is_connected(output)) continue; @@ -451,7 +451,7 @@ static void test_dsc_bpc(data_t *data) for (bpc = 0; bpc < ARRAY_SIZE(bpc_vals); bpc++) { igt_info("Testing bpc = %d\n", bpc_vals[bpc]); - for (i = 0; i < display->n_pipes; i++) { + for (i = 0; i < display->n_outputs; i++) { output = data->output[i]; if (!output || !igt_output_is_connected(output)) continue; @@ -474,7 +474,7 @@ static void test_dsc_bpc(data_t *data) igt_display_commit_atomic(display, DRM_MODE_ATOMIC_ALLOW_MODESET, 0); - for (i = 0; i < display->n_pipes; i++) { + for (i = 0; i < display->n_outputs; i++) { output = data->output[i]; if (!output || !igt_output_is_connected(output)) continue; @@ -501,7 +501,7 @@ static void test_dsc_bpc(data_t *data) } /* Cleanup all fbs */ - for (i = 0; i < display->n_pipes; i++) { + for (i = 0; i < display->n_outputs; i++) { output = data->output[i]; if (!output || !igt_output_is_connected(output)) continue; -- 2.25.1