tests/kms_plane: enable test for sim env
PATCH 1/1 tests/kms_plane: enable test for sim env
Lets do some tweaks to enable this test on simulation environment.
--- tests/kms_plane.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
tests/kms_plane.c +9 -4
@@ -41,7 +41,8 @@#define LUT_MASK 0xf800/* restricted pipe count */ -#define CRTC_RESTRICT_CNT 2 +#define CRTC_RESTRICT_CNT 2 +#define SIM_CRTC_RESTRICT_CNT 1 typedef struct { float red;
@@ -614,7 +615,7 @@ static void capture_crc(data_t *data, unsigned int vblank, igt_crc_t *crc) {igt_pipe_crc_get_for_frame (data->drm_fd, data->pipe_crc, vblank, crc); -igt_fail_on_f (!igt_skip_crc_compare && +igt_fail_on_f (!igt_skip_crc_compare && !igt_run_in_simulation () && crc->has_valid_frame && crc->frame != vblank,"Got CRC for the wrong frame (got %u, expected %u). CRC buffer overflow?\n" , crc->frame, vblank);
@@ -1193,8 +1194,12 @@ static void test_invalid_settings(data_t *data) } } -static bool is_pipe_limit_reached (int count) { -return count >=CRTC_RESTRICT_CNT && !all_pipes; +static bool is_pipe_limit_reached (int count) +{ +if (igt_run_in_simulation ()) +return count >=SIM_CRTC_RESTRICT_CNT && !all_pipes; +else +return count >=CRTC_RESTRICT_CNT && !all_pipes; }static void run_test (data_t *data,void (*test)(data_t *,enum pipe ))
Signature · 1 line
2.25.1
Patchwork
CI[igt-dev] ✓ Fi.CI.BAT: success for tests/kms_plane: enable test for sim env
== Series Details ==
== Series Details ==
Series: tests/kms_plane: enable test for sim env
URL : https://patchwork.freedesktop.org/series/117813/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13151 -> IGTPW_8973
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/index.html
Participating hosts (38 -> 36)
------------------------------
Missing (2): fi-kbl-soraka fi-snb-2520m
Known issues
------------
Here are the changes found in IGTPW_8973 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_module_load@load:
- bat-adls-5: [PASS][1] -> [ABORT][2] ([i915#4391])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/bat-adls-5/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/bat-adls-5/igt@[email protected]
* igt@i915_selftest@live@requests:
- bat-rpls-2: [PASS][3] -> [ABORT][4] ([i915#4983] / [i915#7913])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/bat-rpls-2/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/bat-rpls-2/igt@i915_selftest@[email protected]
#### Possible fixes ####
* igt@i915_pm_rpm@basic-rte:
- {bat-mtlp-8}: [TIMEOUT][5] -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/bat-mtlp-8/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/bat-mtlp-8/igt@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck@pipe-d-dp-1:
- bat-dg2-8: [FAIL][7] ([i915#7932]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/bat-dg2-8/igt@kms_pipe_crc_basic@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/bat-dg2-8/igt@kms_pipe_crc_basic@[email protected]
#### Warnings ####
* igt@i915_selftest@live@slpc:
- bat-rpls-1: [DMESG-WARN][9] ([i915#6367] / [i915#7953]) -> [DMESG-WARN][10] ([i915#6367])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/bat-rpls-1/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/bat-rpls-1/igt@i915_selftest@[email protected]
* igt@i915_suspend@basic-s3-without-i915:
- fi-tgl-1115g4: [INCOMPLETE][11] ([i915#7443] / [i915#7953] / [i915#8102]) -> [INCOMPLETE][12] ([i915#7443] / [i915#8102])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/fi-tgl-1115g4/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/fi-tgl-1115g4/igt@[email protected]
- bat-rpls-1: [ABORT][13] ([i915#6687] / [i915#7953] / [i915#7978]) -> [ABORT][14] ([i915#6687] / [i915#7978])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/bat-rpls-1/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/bat-rpls-1/igt@[email protected]
* igt@kms_setmode@basic-clone-single-crtc:
- bat-rplp-1: [SKIP][15] ([i915#3555] / [i915#4579]) -> [ABORT][16] ([i915#4579] / [i915#8260])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/bat-rplp-1/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/bat-rplp-1/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
[i915#7443]: https://gitlab.freedesktop.org/drm/intel/issues/7443
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7920]: https://gitlab.freedesktop.org/drm/intel/issues/7920
[i915#7932]: https://gitlab.freedesktop.org/drm/intel/issues/7932
[i915#7953]: https://gitlab.freedesktop.org/drm/intel/issues/7953
[i915#7978]: https://gitlab.freedesktop.org/drm/intel/issues/7978
[i915#8102]: https://gitlab.freedesktop.org/drm/intel/issues/8102
[i915#8260]: https://gitlab.freedesktop.org/drm/intel/issues/8260
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_7292 -> IGTPW_8973
CI-20190529: 20190529
CI_DRM_13151: 4a28d03908b9d284f0b64a1fd9f5304761460db8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_8973: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/index.html
IGT_7292: 9d9475ffd3b5ae18fd8ec120595385f6c562f249 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Testlist changes
----------------
-igt@kms_fb_coherency@memset-crc
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/index.html
Patchwork
CI[igt-dev] ✓ Fi.CI.IGT: success for tests/kms_plane: enable test for sim env
In reply to Swati Sharma== Series Details ==
== Series Details ==
Series: tests/kms_plane: enable test for sim env
URL : https://patchwork.freedesktop.org/series/117813/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13151_full -> IGTPW_8973_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/index.html
Participating hosts (7 -> 8)
------------------------------
Additional (1): shard-rkl0
Known issues
------------
Here are the changes found in IGTPW_8973_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_spin_batch@legacy@render:
- shard-apl: [PASS][1] -> [FAIL][2] ([i915#2898])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/shard-apl6/igt@gem_spin_batch@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/shard-apl2/igt@gem_spin_batch@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-glk: [PASS][3] -> [FAIL][4] ([i915#2346])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/shard-glk4/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/shard-glk6/igt@[email protected]
* igt@kms_frontbuffer_tracking@psr-rgb565-draw-render:
- shard-apl: NOTRUN -> [SKIP][5] ([fdo#109271]) +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/shard-apl4/igt@[email protected]
- shard-snb: NOTRUN -> [SKIP][6] ([fdo#109271]) +7 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/shard-snb2/igt@[email protected]
#### Possible fixes ####
* igt@device_reset@unbind-reset-rebind:
- {shard-rkl}: [ABORT][7] ([i915#5507]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/shard-rkl-2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/shard-rkl-2/igt@[email protected]
- shard-apl: [ABORT][9] ([i915#5507]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/shard-apl6/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/shard-apl2/igt@[email protected]
- {shard-tglu}: [ABORT][11] ([i915#5507]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/shard-tglu-7/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/shard-tglu-6/igt@[email protected]
* igt@gem_ctx_exec@basic-nohangcheck:
- {shard-rkl}: [FAIL][13] ([i915#6268]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/shard-rkl-6/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/shard-rkl-7/igt@[email protected]
* igt@gem_eio@kms:
- {shard-dg1}: [FAIL][15] ([i915#5784]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/shard-dg1-17/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/shard-dg1-16/igt@[email protected]
* igt@gem_exec_fair@basic-deadline:
- shard-glk: [FAIL][17] ([i915#2846]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/shard-glk3/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/shard-glk1/igt@[email protected]
* igt@gem_exec_fair@basic-none@bcs0:
- {shard-rkl}: [FAIL][19] ([i915#2842]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/shard-rkl-7/igt@gem_exec_fair@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/shard-rkl-4/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace-share@rcs0:
- {shard-tglu}: [FAIL][21] ([i915#2842]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/shard-tglu-9/igt@gem_exec_fair@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/shard-tglu-6/igt@gem_exec_fair@[email protected]
* igt@i915_pm_rpm@modeset-lpsp-stress:
- {shard-rkl}: [SKIP][23] ([i915#1397]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/shard-rkl-1/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/shard-rkl-7/igt@[email protected]
* igt@i915_selftest@perf@engine_cs:
- shard-snb: [ABORT][25] ([i915#4528] / [i915#4579]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/shard-snb6/igt@i915_selftest@perf@engine_cs.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/shard-snb7/igt@i915_selftest@perf@engine_cs.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-apl: [FAIL][27] ([i915#2346]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/shard-apl4/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/shard-apl3/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible@b-hdmi-a1:
- shard-glk: [FAIL][29] ([i915#79]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/shard-glk2/igt@kms_flip@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/shard-glk8/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-dp1:
- shard-apl: [FAIL][31] ([i915#79]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/shard-apl1/igt@kms_flip@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/shard-apl4/igt@kms_flip@[email protected]
* igt@perf_pmu@idle@rcs0:
- {shard-dg1}: [FAIL][33] ([i915#4349]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13151/shard-dg1-13/igt@perf_pmu@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/shard-dg1-15/igt@perf_pmu@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110542]: https://bugs.freedesktop.org/show_bug.cgi?id=110542
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2436]: https://gitlab.freedesktop.org/drm/intel/issues/2436
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#2898]: https://gitlab.freedesktop.org/drm/intel/issues/2898
[i915#3023]: https://gitlab.freedesktop.org/drm/intel/issues/3023
[i915#315]: https://gitlab.freedesktop.org/drm/intel/issues/315
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3743]: https://gitlab.freedesktop.org/drm/intel/issues/3743
[i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#433]: https://gitlab.freedesktop.org/drm/intel/issues/433
[i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525
[i915#4528]: https://gitlab.freedesktop.org/drm/intel/issues/4528
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4812]: https://gitlab.freedesktop.org/drm/intel/issues/4812
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5493]: https://gitlab.freedesktop.org/drm/intel/issues/5493
[i915#5507]: https://gitlab.freedesktop.org/drm/intel/issues/5507
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6230]: https://gitlab.freedesktop.org/drm/intel/issues/6230
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#6335]: https://gitlab.freedesktop.org/drm/intel/issues/6335
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#7975]: https://gitlab.freedesktop.org/drm/intel/issues/7975
[i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011
[i915#8213]: https://gitlab.freedesktop.org/drm/intel/issues/8213
[i915#8414]: https://gitlab.freedesktop.org/drm/intel/issues/8414
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_7292 -> IGTPW_8973
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_13151: 4a28d03908b9d284f0b64a1fd9f5304761460db8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_8973: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/index.html
IGT_7292: 9d9475ffd3b5ae18fd8ec120595385f6c562f249 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8973/index.html
Quoted 46 lines · Swati Sharma
Lets do some tweaks to enable this test on simulation environment.
Signed-off-by Swati Sharma <[email protected]>--- tests/kms_plane.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)tests/kms_plane.c +9
-4@@ -41,7 +41,8 @@#define LUT_MASK 0xf800/* restricted pipe count */ -#define CRTC_RESTRICT_CNT 2 +#define CRTC_RESTRICT_CNT 2 +#define SIM_CRTC_RESTRICT_CNT 1 typedef struct { float red;@@ -614,7 +615,7 @@ static void capture_crc(data_t *data, unsigned int vblank, igt_crc_t *crc) {igt_pipe_crc_get_for_frame (data->drm_fd, data->pipe_crc, vblank, crc); -igt_fail_on_f (!igt_skip_crc_compare && +igt_fail_on_f (!igt_skip_crc_compare && !igt_run_in_simulation () && crc->has_valid_frame && crc->frame != vblank,"Got CRC for the wrong frame (got %u, expected %u). CRC buffer overflow?\n" , crc->frame, vblank);@@ -1193,8 +1194,12 @@ static void test_invalid_settings(data_t *data) } } -static bool is_pipe_limit_reached (int count) { -return count >=CRTC_RESTRICT_CNT && !all_pipes; +static bool is_pipe_limit_reached (int count) +{ +if (igt_run_in_simulation ()) +return count >=SIM_CRTC_RESTRICT_CNT && !all_pipes; +else +return count >=CRTC_RESTRICT_CNT && !all_pipes; }static void run_test (data_t *data,void (*test)(data_t *,enum pipe ))
Thanks for the review. Patch merged.
Quoted 46 lines · Juha-Pekka Heikkila
Reviewed-by Juha-Pekka Heikkila <[email protected]>Quoted 42 lines · Swati Sharma
Lets do some tweaks to enable this test on simulation environment.
Signed-off-by Swati Sharma <[email protected]>---
tests/kms_plane.c| 13 +++++++++----1 file changed, 9 insertions(+), 4 deletions(-)tests/kms_plane.c +9
-4@@ -41,7 +41,8 @@ #define LUT_MASK 0xf800 /* restricted pipe count */ -#define CRTC_RESTRICT_CNT 2 +#define CRTC_RESTRICT_CNT 2 +#define SIM_CRTC_RESTRICT_CNT 1 typedef struct { float red;@@ -614,7 +615,7 @@ static void capture_crc(data_t *data, unsigned int vblank, igt_crc_t *crc) { igt_pipe_crc_get_for_frame(data->drm_fd, data->pipe_crc, vblank, crc); - igt_fail_on_f(!igt_skip_crc_compare && + igt_fail_on_f(!igt_skip_crc_compare && !igt_run_in_simulation() && crc->has_valid_frame && crc->frame != vblank, "Got CRC for the wrong frame (got %u, expected %u). CRC buffer overflow?\n", crc->frame, vblank);@@ -1193,8 +1194,12 @@ static void test_invalid_settings(data_t *data) } } -static bool is_pipe_limit_reached (int count) { - return count >= CRTC_RESTRICT_CNT && !all_pipes; +static bool is_pipe_limit_reached (int count) +{ + if (igt_run_in_simulation()) + return count >= SIM_CRTC_RESTRICT_CNT && !all_pipes; + else + return count >= CRTC_RESTRICT_CNT && !all_pipes; } static void run_test(data_t *data, void (*test)(data_t *, enum pipe))