* [igt-dev] [PATCH] [i-g-t] tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped
@ 2023-02-21 18:25 hersen wu
2023-02-21 19:19 ` [igt-dev] ✗ Fi.CI.BAT: failure for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: hersen wu @ 2023-02-21 18:25 UTC (permalink / raw)
To: igt-dev, rodrigo.siqueira, aurabindo.pillai, alex.hung; +Cc: hersen wu
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 <hersenxs.wu@amd.com>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [igt-dev] ✗ Fi.CI.BAT: failure for tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped
2023-02-21 18:25 [igt-dev] [PATCH] [i-g-t] tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped hersen wu
@ 2023-02-21 19:19 ` Patchwork
2023-02-23 18:59 ` [igt-dev] [PATCH] [i-g-t] " Alex Hung
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2023-02-21 19:19 UTC (permalink / raw)
To: hersen wu; +Cc: igt-dev
[-- Attachment #1: Type: text/plain, Size: 5976 bytes --]
== Series Details ==
Series: tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped
URL : https://patchwork.freedesktop.org/series/114230/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_12767 -> IGTPW_8514
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with IGTPW_8514 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in IGTPW_8514, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8514/index.html
Participating hosts (38 -> 37)
------------------------------
Missing (1): fi-snb-2520m
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_8514:
### IGT changes ###
#### Possible regressions ####
* igt@i915_pm_rpm@module-reload:
- bat-rplp-1: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12767/bat-rplp-1/igt@i915_pm_rpm@module-reload.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8514/bat-rplp-1/igt@i915_pm_rpm@module-reload.html
* igt@i915_selftest@live@dmabuf:
- bat-rplp-1: [PASS][3] -> [DMESG-WARN][4] +5 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12767/bat-rplp-1/igt@i915_selftest@live@dmabuf.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8514/bat-rplp-1/igt@i915_selftest@live@dmabuf.html
Known issues
------------
Here are the changes found in IGTPW_8514 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@slpc:
- bat-rpls-2: NOTRUN -> [DMESG-FAIL][5] ([i915#6367])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8514/bat-rpls-2/igt@i915_selftest@live@slpc.html
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- bat-rpls-2: NOTRUN -> [SKIP][6] ([i915#7828])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8514/bat-rpls-2/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
- bat-rpls-1: NOTRUN -> [SKIP][7] ([i915#7828])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8514/bat-rpls-1/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
* igt@kms_pipe_crc_basic@suspend-read-crc:
- bat-rpls-1: NOTRUN -> [SKIP][8] ([i915#1845])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8514/bat-rpls-1/igt@kms_pipe_crc_basic@suspend-read-crc.html
- bat-rpls-2: NOTRUN -> [SKIP][9] ([i915#1845])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8514/bat-rpls-2/igt@kms_pipe_crc_basic@suspend-read-crc.html
* igt@kms_pipe_crc_basic@suspend-read-crc@pipe-a-edp-1:
- bat-rplp-1: [PASS][10] -> [DMESG-WARN][11] ([i915#2867]) +25 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12767/bat-rplp-1/igt@kms_pipe_crc_basic@suspend-read-crc@pipe-a-edp-1.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8514/bat-rplp-1/igt@kms_pipe_crc_basic@suspend-read-crc@pipe-a-edp-1.html
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s3@smem:
- bat-rpls-1: [ABORT][12] ([i915#6687] / [i915#7978]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12767/bat-rpls-1/igt@gem_exec_suspend@basic-s3@smem.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8514/bat-rpls-1/igt@gem_exec_suspend@basic-s3@smem.html
* igt@i915_selftest@live@migrate:
- bat-atsm-1: [DMESG-FAIL][14] ([i915#7699]) -> [PASS][15]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12767/bat-atsm-1/igt@i915_selftest@live@migrate.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8514/bat-atsm-1/igt@i915_selftest@live@migrate.html
* igt@i915_selftest@live@reset:
- bat-rpls-2: [ABORT][16] ([i915#4983]) -> [PASS][17]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12767/bat-rpls-2/igt@i915_selftest@live@reset.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8514/bat-rpls-2/igt@i915_selftest@live@reset.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions:
- fi-bsw-n3050: [FAIL][18] ([i915#6298]) -> [PASS][19]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12767/fi-bsw-n3050/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8514/fi-bsw-n3050/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#6298]: https://gitlab.freedesktop.org/drm/intel/issues/6298
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
[i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7978]: https://gitlab.freedesktop.org/drm/intel/issues/7978
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_7168 -> IGTPW_8514
CI-20190529: 20190529
CI_DRM_12767: 73651405609f4d0b0b58a04faf84fafd8397b39e @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_8514: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8514/index.html
IGT_7168: 165df656261863684067cd53f95c3a301e67fa24 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Testlist changes
----------------
+++ 0 lines
--- 787 lines
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8514/index.html
[-- Attachment #2: Type: text/html, Size: 7028 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [igt-dev] [PATCH] [i-g-t] tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped
2023-02-21 18:25 [igt-dev] [PATCH] [i-g-t] tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped hersen wu
2023-02-21 19:19 ` [igt-dev] ✗ Fi.CI.BAT: failure for " Patchwork
@ 2023-02-23 18:59 ` Alex Hung
2023-02-24 8:49 ` Kamil Konieczny
2023-02-28 13:42 ` [igt-dev] ✗ Fi.CI.BUILD: failure for tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped (rev2) Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Alex Hung @ 2023-02-23 18:59 UTC (permalink / raw)
To: igt-dev, hersen wu
On 2023-02-21 11:25, hersen wu wrote:
> 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 <hersenxs.wu@amd.com>
> ---
> 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;
Reviewed-by: Alex Hung <alex.hung@amd.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [igt-dev] [PATCH] [i-g-t] tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped
2023-02-21 18:25 [igt-dev] [PATCH] [i-g-t] tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped hersen wu
2023-02-21 19:19 ` [igt-dev] ✗ Fi.CI.BAT: failure for " Patchwork
2023-02-23 18:59 ` [igt-dev] [PATCH] [i-g-t] " Alex Hung
@ 2023-02-24 8:49 ` Kamil Konieczny
2023-02-28 13:39 ` Wu, Hersen
2023-02-28 13:42 ` [igt-dev] ✗ Fi.CI.BUILD: failure for tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped (rev2) Patchwork
3 siblings, 1 reply; 6+ messages in thread
From: Kamil Konieczny @ 2023-02-24 8:49 UTC (permalink / raw)
To: igt-dev; +Cc: hersen wu
Hi Hersen,
On 2023-02-21 at 13:25:57 -0500, hersen wu wrote:
> 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.
Please improve description, you fixed a bug but you do not need
to write 1:1 about your code, just describe problem and that
you fixed it. For example:
Pipe max value was used instead of output one. Fixed that.
You can also give gitlab ticket or tag for commit which you fixed
or some error logs (but not too big).
>
> Signed-off-by: hersen wu <hersenxs.wu@amd.com>
---------------- ^ ^
This should be uppercase:
Signed-off-by: Hersen Wu <hersenxs.wu@amd.com>
> ---
> 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) {
Drop this, do not mix improvements with fixes.
> 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;
Drop this.
>
> - for (i = 0; i < display->n_pipes; ++i) {
> + for_each_pipe(display, i) {
Drop this.
> 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) {
Drop this.
> 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++) {
Nice catch, this starts real fixes.
Please keep only fixes and resend v2 with r-b from Alex.
Regards,
Kamil
> /* 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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [igt-dev] [PATCH] [i-g-t] tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped
2023-02-24 8:49 ` Kamil Konieczny
@ 2023-02-28 13:39 ` Wu, Hersen
0 siblings, 0 replies; 6+ messages in thread
From: Wu, Hersen @ 2023-02-28 13:39 UTC (permalink / raw)
To: Kamil Konieczny, igt-dev@lists.freedesktop.org
[AMD Official Use Only - General]
From: Hersen Wu <hersenxs.wu@amd.com>
Date: Mon, 20 Feb 2023 11:01:34 -0500
Subject: [PATCH] [i-g-t] tests/amdgpu/amd_dp_dsc: fix basic and bpc test be
skipped
dsc tests be skipped when output max value less than pipe max value.
pipe max value was used instead of max output value.
Signed-off-by: Hersen Wu <hersenxs.wu@amd.com>
---
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
-----Original Message-----
From: Kamil Konieczny <kamil.konieczny@linux.intel.com>
Sent: Friday, February 24, 2023 3:49 AM
To: igt-dev@lists.freedesktop.org
Cc: Wu, Hersen <hersenxs.wu@amd.com>; Siqueira, Rodrigo <Rodrigo.Siqueira@amd.com>; Pillai, Aurabindo <Aurabindo.Pillai@amd.com>; Hung, Alex <Alex.Hung@amd.com>
Subject: Re: [igt-dev] [PATCH] [i-g-t] tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped
Hi Hersen,
On 2023-02-21 at 13:25:57 -0500, hersen wu wrote:
> 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.
Please improve description, you fixed a bug but you do not need to write 1:1 about your code, just describe problem and that you fixed it. For example:
Pipe max value was used instead of output one. Fixed that.
You can also give gitlab ticket or tag for commit which you fixed or some error logs (but not too big).
>
> Signed-off-by: hersen wu <hersenxs.wu@amd.com>
---------------- ^ ^
This should be uppercase:
Signed-off-by: Hersen Wu <hersenxs.wu@amd.com>
> ---
> 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) {
Drop this, do not mix improvements with fixes.
> 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;
Drop this.
>
> - for (i = 0; i < display->n_pipes; ++i) {
> + for_each_pipe(display, i) {
Drop this.
> 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) {
Drop this.
> 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++) {
Nice catch, this starts real fixes.
Please keep only fixes and resend v2 with r-b from Alex.
Regards,
Kamil
> /* 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
>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [igt-dev] ✗ Fi.CI.BUILD: failure for tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped (rev2)
2023-02-21 18:25 [igt-dev] [PATCH] [i-g-t] tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped hersen wu
` (2 preceding siblings ...)
2023-02-24 8:49 ` Kamil Konieczny
@ 2023-02-28 13:42 ` Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2023-02-28 13:42 UTC (permalink / raw)
To: Wu, Hersen; +Cc: igt-dev
== Series Details ==
Series: tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped (rev2)
URL : https://patchwork.freedesktop.org/series/114230/
State : failure
== Summary ==
Applying: tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped
Using index info to reconstruct a base tree...
Patch failed at 0001 tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-02-28 13:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-21 18:25 [igt-dev] [PATCH] [i-g-t] tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped hersen wu
2023-02-21 19:19 ` [igt-dev] ✗ Fi.CI.BAT: failure for " Patchwork
2023-02-23 18:59 ` [igt-dev] [PATCH] [i-g-t] " Alex Hung
2023-02-24 8:49 ` Kamil Konieczny
2023-02-28 13:39 ` Wu, Hersen
2023-02-28 13:42 ` [igt-dev] ✗ Fi.CI.BUILD: failure for tests/amdgpu/amd_dp_dsc: fix basic and bpc test be skipped (rev2) Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox