tests/kms_plane_scaling: Fix off-by-one plane selection
PATCH 1/1 tests/kms_plane_scaling: Fix off-by-one plane selection
Commit ca20170afc6f ("tests/kms_plane_scaling: Add support for dynamic number of planes") shifted the tested planes by one after the refactoring, accidentally ignoring the first plane, which is zero indexed. A symptom of the issue appears on KBL, where the third plane is already the shared cursor, causing igt to configure an unsupported framebuffer format on it, triggering the following error:
[drm:__setplane_internal] Invalid pixel format XR24 little-endian (0x34325258)
With this fixed, we can exposes the pixel clock scaling issue, which is the actual problem being tracked in Bug 103159, but let's start by reverting to the old behavior.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103159
--- tests/kms_plane_scaling.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tests/kms_plane_scaling.c +3 -3
@@ -195,7 +195,7 @@ static void test_plane_scaling(data_t *d)igt_assert (d->fb_id3);/* Set up display with plane 1 */ - d->plane1 =igt_output_get_plane (output,1 ); + d->plane1 =igt_output_get_plane (output,0 );prepare_crtc (d, output, pipe, d->plane1, mode,COMMIT_UNIVERSAL );if (primary_plane_scaling) {
@@ -215,7 +215,7 @@ static void test_plane_scaling(data_t *d) }/* Set up fb2->plane2 mapping. */ - d->plane2 =igt_output_get_plane (output,2 ); + d->plane2 =igt_output_get_plane (output,1 );igt_plane_set_fb (d->plane2, &d->fb2);/* 2nd plane windowed */
@@ -251,7 +251,7 @@ static void test_plane_scaling(data_t *d) }/* Set up fb3->plane3 mapping. */ - d->plane3 =igt_output_get_plane (output,3 ); + d->plane3 =igt_output_get_plane (output,2 );igt_plane_set_fb (d->plane3, &d->fb3);/* 3rd plane windowed - no scaling */
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hey Gabriel,
I've reviewed and pushed this patch.
Thanks.
Rob.
Quoted 49 lines · Gabriel Krisman Bertazi
Commit
ca20170afc6f("tests/kms_plane_scaling: Add support for dynamic
number of planes") shifted the tested planes by one after the refactoring, accidentally ignoring the first plane, which is zero indexed. A symptom of the issue appears on KBL, where the third plane
is already the shared cursor, causing igt to configure an unsupported framebuffer format on it, triggering the following error:[drm:__setplane_internal] Invalid pixel format XR24 little-endian (
0x34325258)With this fixed, we can exposes the pixel clock scaling issue, which is
the actual problem being tracked in Bug 103159, but let's start by reverting to the old behavior.Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103159
Fixes ca20170afc6f ("tests/kms_plane_scaling: Add support fordynamic number of planes")
Signed-off-by Gabriel Krisman Bertazi <[email protected]>--- tests/kms_plane_scaling.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)tests/kms_plane_scaling.c +1
-1@@ -195,7 +195,7 @@ static void test_plane_scaling(data_t *d)igt_assert (d->fb_id3);/* Set up display with plane 1 */ - d->plane1 =igt_output_get_plane (output,1 ); + d->plane1 =igt_output_get_plane (output,0 );prepare_crtc (d, output, pipe, d->plane1, mode,COMMIT_UNIVERSAL );tests/kms_plane_scaling.c +1
-1if (primary_plane_scaling) {@@ -215,7 +215,7 @@ static void test_plane_scaling(data_t *d) }/* Set up fb2->plane2 mapping. */ - d->plane2 =igt_output_get_plane (output,2 ); + d->plane2 =igt_output_get_plane (output,1 );igt_plane_set_fb (d->plane2, &d->fb2);/* 2nd plane windowed */
tests/kms_plane_scaling.c static void test_plane_scaling(data_t *d) · line 257
Quoted 8 lines
tests/kms_plane_scaling.c +1
-1@@ -251,7 +251,7 @@ static void test_plane_scaling(data_t *d) }/* Set up fb3->plane3 mapping. */ - d->plane3 =igt_output_get_plane (output,3 ); + d->plane3 =igt_output_get_plane (output,2 );igt_plane_set_fb (d->plane3, &d->fb3);/* 3rd plane windowed - no scaling */
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for tests/kms_plane_scaling: Fix off-by-one plane selection
In reply to Gabriel Krisman Bertazi== Series Details ==
== Series Details ==
Series: tests/kms_plane_scaling: Fix off-by-one plane selection
URL : https://patchwork.freedesktop.org/series/33277/
State : success
== Summary ==
IGT patchset tested on top of latest successful build b9f2abda9503bd55690cf3c2ccf2f20e8fc19ab3 tests/gem_eio: Nerf in-flight-suspend
with latest DRM-Tip kernel build CI_DRM_33167210ac064da2 drm-tip: 2017y-11m-06d-14h-42m-36s UTC integration manifest
No testlist changes.
Test kms_frontbuffer_tracking:
Subgroup basic:
pass -> DMESG-WARN (fi-bdw-5557u) fdo#102473
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
pass -> INCOMPLETE (fi-kbl-7560u) fdo#102846fdo#102473 https://bugs.freedesktop.org/show_bug.cgi?id=102473
fdo#102846 https://bugs.freedesktop.org/show_bug.cgi?id=102846
fi-bdw-5557u total:289 pass:267 dwarn:1 dfail:0 fail:0 skip:21 time:450s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:459s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:387s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:546s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:278s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:506s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:509s fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:513s fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:496s fi-cfl-s total:289 pass:254 dwarn:3 dfail:0 fail:0 skip:32 time:567s fi-cnl-y total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:632s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:433s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:265s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:588s fi-glk-dsi total:289 pass:258 dwarn:0 dfail:0 fail:1 skip:30 time:497s fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:431s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:432s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:434s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:502s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:459s fi-kbl-7560u total:245 pass:228 dwarn:0 dfail:0 fail:0 skip:16 fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:485s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:581s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:579s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:458s fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:596s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:653s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:528s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:507s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:460s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:574s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:432s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_478/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for tests/kms_plane_scaling: Fix off-by-one plane selection
In reply to Gabriel Krisman Bertazi== Series Details ==
== Series Details ==
Series: tests/kms_plane_scaling: Fix off-by-one plane selection
URL : https://patchwork.freedesktop.org/series/33277/
State : success
== Summary ==
Test kms_flip:
Subgroup dpms-vs-vblank-race-interruptible:
fail -> PASS (shard-hsw) fdo#103060
Subgroup vblank-vs-suspend:
fail -> PASS (shard-hsw) fdo#103375
Subgroup wf_vblank-vs-dpms:
incomplete -> PASS (shard-hsw) fdo#102614
Test kms_plane_lowres:
Subgroup pipe-b-tiling-none:
dmesg-warn -> PASS (shard-hsw)
Test kms_busy:
Subgroup extended-modeset-hang-newfb-with-reset-render-c:
pass -> DMESG-WARN (shard-hsw) fdo#102249 +1
Subgroup extended-modeset-hang-newfb-with-reset-render-b:
pass -> DMESG-WARN (shard-hsw) fdo#103038
Test kms_setmode:
Subgroup basic:
fail -> PASS (shard-hsw) fdo#99912fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#102249 https://bugs.freedesktop.org/show_bug.cgi?id=102249
fdo#103038 https://bugs.freedesktop.org/show_bug.cgi?id=103038
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
shard-hsw total:2540 pass:1432 dwarn:2 dfail:0 fail:9 skip:1097 time:9283s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_478/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx