From 3434cef8be4e487644a740039ad15123cd094526 Mon Sep 17 00:00:00 2001
From: Hersen Wu <hersenxs.wu@amd.com>
Date: Mon, 6 Mar 2023 09:35:20 -0500
Subject: [PATCH] tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped
amd_dp_dsc tests are skipped when output max value (n_outputs)
is fewer than pipe max value (n_pipes) because a pipe may not
be enabled, i.e. display->pipes[i].enable == false. As a result,
n_outputs should be used instead.
Reviewed-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Hersen Wu <hersenxs.wu@amd.com>
---
tests/amdgpu/amd_dp_dsc.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/tests/amdgpu/amd_dp_dsc.c b/tests/amdgpu/amd_dp_dsc.c
index e6b5a43be..b3f3cafb9 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]);
}
@@ -63,7 +63,7 @@ static void test_init(data_t *data)
igt_display_t *display = &data->display;
int i, n;
- 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(
@@ -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;
--
GitLab