tests/intel/kms_big_fb: Skip 90/270 rotation on Display Ver >= 13
PATCH 1/1 tests/intel/kms_big_fb: Skip 90/270 rotation on Display Ver >= 13
From Display Ver 13, 90/270 hardware rotation no longer supported. Skip these tests on affected platforms. Also move plane capability checks to the outer loop to continue testing other planes.
--- tests/intel/kms_big_fb.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
tests/intel/kms_big_fb.c +9 -6
@@ -172,6 +172,7 @@ typedef struct {int hw_stride;int max_hw_fb_width;double planeclearrgb[3 ]; +int disp_ver; } data_t; static struct intel_buf *init_buf(data_t *data,
@@ -422,12 +423,6 @@ static bool test_plane(data_t *data) { w, h, }, }; -if (!igt_plane_has_format_mod (plane, data->format, data->modifier)) -return false; - -if (!igt_plane_has_rotation (plane, data->rotation)) -return false; -if (igt_plane_has_prop (plane,IGT_PLANE_ROTATION ))igt_plane_set_rotation (plane, data->rotation);igt_plane_set_position (plane,0 ,0 );
@@ -570,6 +565,10 @@ static bool test_pipe(data_t *data) IGT_PIPE_CRC_SOURCE_AUTO);for_each_plane_on_pipe (&data->display, data->crtc->pipe, data->plane) { +if (!igt_plane_has_rotation (data->plane, data->rotation)) +continue ; +if (!igt_plane_has_format_mod (data->plane, data->format, data->modifier)) +continue ; ret =test_plane (data);if (ret || run_in_simulation)break ;
@@ -688,6 +687,9 @@ static void test_scanout(data_t *data)igt_crtc_t *crtc;igt_output_t *output; +if (igt_rotation_90_or_270 (data->rotation)) +igt_require_f (data->disp_ver <13 ,"90/270 rotation not supported by platform\n" ); +igt_require (data->format ==DRM_FORMAT_C8 ||igt_fb_supported_format (data->format));
@@ -983,6 +985,7 @@ int igt_main()igt_require (is_intel_device (data.drm_fd)); data.devid =intel_get_drm_devid (data.drm_fd); + data.disp_ver =intel_display_ver (data.devid);kmstest_set_vt_graphics_mode ();
Signature · 1 line
2.34.1
Quoted 4 lines · Pranay Samala
Quoted 1 line
From Display Ver 13, 90/270 hardware rotation no longer
supported. Skip these tests on affected platforms. Also move plane capability checks to the outer loop to continue testing other planes.
That's two different things -> should be two patches
Quoted 32 lines
Signed-off-by Pranay Samala <[email protected]>--- tests/intel/kms_big_fb.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)tests/intel/kms_big_fb.c +1
-6@@ -172,6 +172,7 @@ typedef struct {int hw_stride;int max_hw_fb_width;double planeclearrgb[3 ]; +int disp_ver; } data_t; static struct intel_buf *init_buf(data_t *data,@@ -422,12 +423,6 @@ static bool test_plane(data_t *data) { w, h, }, }; -if (!igt_plane_has_format_mod (plane, data->format, data->modifier)) -return false; - -if (!igt_plane_has_rotation (plane, data->rotation)) -return false; -if (igt_plane_has_prop (plane,IGT_PLANE_ROTATION ))igt_plane_set_rotation (plane, data->rotation);igt_plane_set_position (plane,0 ,0 );
tests/intel/kms_big_fb.c static bool test_pipe(data_t *data) · line 573
Quoted 9 lines
tests/intel/kms_big_fb.c +4
-0@@ -570,6 +565,10 @@ static bool test_pipe(data_t *data) IGT_PIPE_CRC_SOURCE_AUTO);for_each_plane_on_pipe (&data->display, data->crtc->pipe, data->plane) { +if (!igt_plane_has_rotation (data->plane, data->rotation)) +continue ; +if (!igt_plane_has_format_mod (data->plane, data->format, data->modifier)) +continue ; ret =test_plane (data);if (ret || run_in_simulation)
That whole run_in_simulation nonsense seems to be the reason why you need to change something here. Just remove the nonsense and this should work fine.
tests/intel/kms_big_fb.c static void test_scanout(data_t *data) · line 691
Quoted 7 lines
tests/intel/kms_big_fb.c +2
-0break ;@@ -688,6 +687,9 @@ static void test_scanout(data_t *data)igt_crtc_t *crtc;igt_output_t *output; +if (igt_rotation_90_or_270 (data->rotation)) +igt_require_f (data->disp_ver <13 ,"90/270 rotation not supported by platform\n" );
Please don't add yet more platform checks when the test already has the hardware agnostic logic to skip everything when the thing isn't supported.
Quoted 14 lines
tests/intel/kms_big_fb.c +2
-0+igt_require (data->format ==DRM_FORMAT_C8 ||igt_fb_supported_format (data->format));@@ -983,6 +985,7 @@ int igt_main()igt_require (is_intel_device (data.drm_fd)); data.devid =intel_get_drm_devid (data.drm_fd); + data.disp_ver =intel_display_ver (data.devid);kmstest_set_vt_graphics_mode ();Signature · 1 line
2.34.1
Signature · 2 lines
Ville Syrjälä Intel
Patchwork
CI✗ Fi.CI.BUILD: failure for tests/intel/kms_big_fb: Skip 90/270 rotation on Display Ver >= 13
In reply to Pranay Samala== Series Details ==
== Series Details ==
Series: tests/intel/kms_big_fb: Skip 90/270 rotation on Display Ver >= 13
URL : https://patchwork.freedesktop.org/series/162271/
State : failure
== Summary ==
Applying: tests/intel/kms_big_fb: Skip 90/270 rotation on Display Ver >= 13 Using index info to reconstruct a base tree...
M tests/intel/kms_big_fb.c
Falling back to patching base and 3-way merge...
Auto-merging tests/intel/kms_big_fb.c
CONFLICT (content): Merge conflict in tests/intel/kms_big_fb.c
Patch failed at 0001 tests/intel/kms_big_fb: Skip 90/270 rotation on Display Ver >= 13 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".