* [igt-dev] [PATCH RESEND] lib/kms: Enable outputs by default in igt_require_display
@ 2018-12-07 14:01 Daniel Vetter
2018-12-07 14:21 ` Maarten Lankhorst
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Daniel Vetter @ 2018-12-07 14:01 UTC (permalink / raw)
To: IGT development; +Cc: Daniel Vetter
More testing, automatically when using the high-level kms helpers!
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
lib/igt_kms.c | 6 +++++-
tests/kms_invalid_dotclock.c | 1 -
tests/kms_pipe_crc_basic.c | 2 --
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index e5f42a6bbcbb..684a599ca674 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -2035,7 +2035,11 @@ void igt_display_require(igt_display_t *display, int drm_fd)
out:
LOG_UNINDENT(display);
- igt_require(display->n_pipes && display->n_outputs);
+ if (display->n_pipes && display->n_outputs)
+ igt_enable_connectors(drm_fd);
+ else
+ igt_skip("No KMS driver or no outputs, pipes: %d, outputs: %d\n",
+ display->n_pipes, display->n_outputs);
}
/**
diff --git a/tests/kms_invalid_dotclock.c b/tests/kms_invalid_dotclock.c
index 8c4c3122bec1..275007df942d 100644
--- a/tests/kms_invalid_dotclock.c
+++ b/tests/kms_invalid_dotclock.c
@@ -131,7 +131,6 @@ igt_simple_main
data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
igt_require_intel(data.drm_fd);
- igt_enable_connectors(data.drm_fd);
kmstest_set_vt_graphics_mode();
igt_display_require(&data.display, data.drm_fd);
diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c
index 5bc0952fca3d..60802848d3ee 100644
--- a/tests/kms_pipe_crc_basic.c
+++ b/tests/kms_pipe_crc_basic.c
@@ -181,8 +181,6 @@ igt_main
igt_fixture {
data.drm_fd = drm_open_driver_master(DRIVER_ANY);
- igt_enable_connectors(data.drm_fd);
-
kmstest_set_vt_graphics_mode();
igt_require_pipe_crc(data.drm_fd);
--
2.20.0.rc1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [igt-dev] [PATCH RESEND] lib/kms: Enable outputs by default in igt_require_display
2018-12-07 14:01 [igt-dev] [PATCH RESEND] lib/kms: Enable outputs by default in igt_require_display Daniel Vetter
@ 2018-12-07 14:21 ` Maarten Lankhorst
2018-12-07 15:00 ` Daniel Vetter
2018-12-07 15:14 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2018-12-07 22:15 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2 siblings, 1 reply; 5+ messages in thread
From: Maarten Lankhorst @ 2018-12-07 14:21 UTC (permalink / raw)
To: Daniel Vetter, IGT development; +Cc: Daniel Vetter
Op 07-12-2018 om 15:01 schreef Daniel Vetter:
> More testing, automatically when using the high-level kms helpers!
>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
> lib/igt_kms.c | 6 +++++-
> tests/kms_invalid_dotclock.c | 1 -
> tests/kms_pipe_crc_basic.c | 2 --
> 3 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/lib/igt_kms.c b/lib/igt_kms.c
> index e5f42a6bbcbb..684a599ca674 100644
> --- a/lib/igt_kms.c
> +++ b/lib/igt_kms.c
> @@ -2035,7 +2035,11 @@ void igt_display_require(igt_display_t *display, int drm_fd)
> out:
> LOG_UNINDENT(display);
>
> - igt_require(display->n_pipes && display->n_outputs);
> + if (display->n_pipes && display->n_outputs)
> + igt_enable_connectors(drm_fd);
> + else
> + igt_skip("No KMS driver or no outputs, pipes: %d, outputs: %d\n",
> + display->n_pipes, display->n_outputs);
> }
>
> /**
> diff --git a/tests/kms_invalid_dotclock.c b/tests/kms_invalid_dotclock.c
> index 8c4c3122bec1..275007df942d 100644
> --- a/tests/kms_invalid_dotclock.c
> +++ b/tests/kms_invalid_dotclock.c
> @@ -131,7 +131,6 @@ igt_simple_main
> data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> igt_require_intel(data.drm_fd);
>
> - igt_enable_connectors(data.drm_fd);
> kmstest_set_vt_graphics_mode();
>
> igt_display_require(&data.display, data.drm_fd);
> diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c
> index 5bc0952fca3d..60802848d3ee 100644
> --- a/tests/kms_pipe_crc_basic.c
> +++ b/tests/kms_pipe_crc_basic.c
> @@ -181,8 +181,6 @@ igt_main
> igt_fixture {
> data.drm_fd = drm_open_driver_master(DRIVER_ANY);
>
> - igt_enable_connectors(data.drm_fd);
> -
> kmstest_set_vt_graphics_mode();
>
> igt_require_pipe_crc(data.drm_fd);
At some point we should integrate chamelium too?
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [igt-dev] [PATCH RESEND] lib/kms: Enable outputs by default in igt_require_display
2018-12-07 14:21 ` Maarten Lankhorst
@ 2018-12-07 15:00 ` Daniel Vetter
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Vetter @ 2018-12-07 15:00 UTC (permalink / raw)
To: Maarten Lankhorst; +Cc: IGT development, Daniel Vetter
On Fri, Dec 07, 2018 at 03:21:34PM +0100, Maarten Lankhorst wrote:
> Op 07-12-2018 om 15:01 schreef Daniel Vetter:
> > More testing, automatically when using the high-level kms helpers!
> >
> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > ---
> > lib/igt_kms.c | 6 +++++-
> > tests/kms_invalid_dotclock.c | 1 -
> > tests/kms_pipe_crc_basic.c | 2 --
> > 3 files changed, 5 insertions(+), 4 deletions(-)
> >
> > diff --git a/lib/igt_kms.c b/lib/igt_kms.c
> > index e5f42a6bbcbb..684a599ca674 100644
> > --- a/lib/igt_kms.c
> > +++ b/lib/igt_kms.c
> > @@ -2035,7 +2035,11 @@ void igt_display_require(igt_display_t *display, int drm_fd)
> > out:
> > LOG_UNINDENT(display);
> >
> > - igt_require(display->n_pipes && display->n_outputs);
> > + if (display->n_pipes && display->n_outputs)
> > + igt_enable_connectors(drm_fd);
> > + else
> > + igt_skip("No KMS driver or no outputs, pipes: %d, outputs: %d\n",
> > + display->n_pipes, display->n_outputs);
> > }
> >
> > /**
> > diff --git a/tests/kms_invalid_dotclock.c b/tests/kms_invalid_dotclock.c
> > index 8c4c3122bec1..275007df942d 100644
> > --- a/tests/kms_invalid_dotclock.c
> > +++ b/tests/kms_invalid_dotclock.c
> > @@ -131,7 +131,6 @@ igt_simple_main
> > data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> > igt_require_intel(data.drm_fd);
> >
> > - igt_enable_connectors(data.drm_fd);
> > kmstest_set_vt_graphics_mode();
> >
> > igt_display_require(&data.display, data.drm_fd);
> > diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c
> > index 5bc0952fca3d..60802848d3ee 100644
> > --- a/tests/kms_pipe_crc_basic.c
> > +++ b/tests/kms_pipe_crc_basic.c
> > @@ -181,8 +181,6 @@ igt_main
> > igt_fixture {
> > data.drm_fd = drm_open_driver_master(DRIVER_ANY);
> >
> > - igt_enable_connectors(data.drm_fd);
> > -
> > kmstest_set_vt_graphics_mode();
> >
> > igt_require_pipe_crc(data.drm_fd);
>
> At some point we should integrate chamelium too?
Hm, I thought chamelium is enabled by default? But yeah, if not we should
definitely make sure that's the case.
> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Thanks for the review.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for lib/kms: Enable outputs by default in igt_require_display
2018-12-07 14:01 [igt-dev] [PATCH RESEND] lib/kms: Enable outputs by default in igt_require_display Daniel Vetter
2018-12-07 14:21 ` Maarten Lankhorst
@ 2018-12-07 15:14 ` Patchwork
2018-12-07 22:15 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-12-07 15:14 UTC (permalink / raw)
To: Daniel Vetter; +Cc: igt-dev
== Series Details ==
Series: lib/kms: Enable outputs by default in igt_require_display
URL : https://patchwork.freedesktop.org/series/53754/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5286 -> IGTPW_2136
====================================================
Summary
-------
**WARNING**
Minor unknown changes coming with IGTPW_2136 need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in IGTPW_2136, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/53754/revisions/1/mbox/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_2136:
### IGT changes ###
#### Warnings ####
* igt@pm_rps@basic-api:
- fi-apl-guc: SKIP -> PASS +14
Known issues
------------
Here are the changes found in IGTPW_2136 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_create@basic-files:
- fi-bsw-n3050: PASS -> FAIL [fdo#108656]
* igt@i915_selftest@live_coherency:
- fi-gdg-551: PASS -> DMESG-FAIL [fdo#107164]
#### Possible fixes ####
* igt@i915_selftest@live_execlists:
- fi-apl-guc: INCOMPLETE [fdo#103927] -> PASS
* igt@vgem_basic@dmabuf-export:
- fi-apl-guc: DMESG-WARN [fdo#108968] -> PASS +10
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#107164]: https://bugs.freedesktop.org/show_bug.cgi?id=107164
[fdo#108656]: https://bugs.freedesktop.org/show_bug.cgi?id=108656
[fdo#108968]: https://bugs.freedesktop.org/show_bug.cgi?id=108968
Participating hosts (50 -> 44)
------------------------------
Additional (2): fi-glk-j4005 fi-pnv-d510
Missing (8): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-icl-u3 fi-icl-y
Build changes
-------------
* IGT: IGT_4743 -> IGTPW_2136
CI_DRM_5286: 47717a5a4d159f980da051acd168f2c40dbc6736 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2136: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2136/
IGT_4743: edb2db2cf2b6665d7ba3fa9117263302f6307a4f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2136/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread* [igt-dev] ✓ Fi.CI.IGT: success for lib/kms: Enable outputs by default in igt_require_display
2018-12-07 14:01 [igt-dev] [PATCH RESEND] lib/kms: Enable outputs by default in igt_require_display Daniel Vetter
2018-12-07 14:21 ` Maarten Lankhorst
2018-12-07 15:14 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
@ 2018-12-07 22:15 ` Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-12-07 22:15 UTC (permalink / raw)
To: Daniel Vetter; +Cc: igt-dev
== Series Details ==
Series: lib/kms: Enable outputs by default in igt_require_display
URL : https://patchwork.freedesktop.org/series/53754/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5286_full -> IGTPW_2136_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/53754/revisions/1/mbox/
Known issues
------------
Here are the changes found in IGTPW_2136_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_fence@basic-await-default:
- shard-hsw: PASS -> FAIL [fdo#108888]
* igt@kms_color@pipe-a-degamma:
- shard-apl: PASS -> FAIL [fdo#104782] / [fdo#108145]
* igt@kms_color@pipe-c-ctm-max:
- shard-apl: PASS -> FAIL [fdo#108147] +1
* igt@kms_color@pipe-c-legacy-gamma:
- shard-apl: PASS -> FAIL [fdo#104782] +1
* igt@kms_cursor_crc@cursor-128x128-suspend:
- shard-apl: PASS -> INCOMPLETE [fdo#103927]
* igt@kms_cursor_crc@cursor-256x85-random:
- shard-apl: PASS -> FAIL [fdo#103232] +4
- shard-glk: PASS -> FAIL [fdo#103232] +2
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-fullscreen:
- shard-glk: PASS -> FAIL [fdo#103167] +3
- shard-apl: PASS -> FAIL [fdo#103167]
* igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb:
- shard-apl: PASS -> FAIL [fdo#108145]
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max:
- shard-glk: PASS -> FAIL [fdo#108145] +2
* igt@kms_plane_multiple@atomic-pipe-a-tiling-y:
- shard-glk: PASS -> FAIL [fdo#103166] +5
* igt@kms_plane_multiple@atomic-pipe-b-tiling-y:
- shard-apl: PASS -> FAIL [fdo#103166] +2
* igt@perf_pmu@init-busy-vcs1:
- shard-snb: PASS -> INCOMPLETE [fdo#105411] / [fdo#107469]
* igt@perf_pmu@rc6-runtime-pm-long:
- shard-kbl: PASS -> FAIL [fdo#105010]
#### Possible fixes ####
* igt@kms_available_modes_crc@available_mode_test_crc:
- shard-apl: FAIL [fdo#106641] -> PASS
* igt@kms_cursor_crc@cursor-128x42-sliding:
- shard-kbl: FAIL [fdo#103232] -> PASS
- shard-apl: FAIL [fdo#103232] -> PASS +3
* igt@kms_cursor_crc@cursor-64x64-suspend:
- shard-apl: FAIL [fdo#103191] / [fdo#103232] -> PASS
* igt@kms_flip@blocking-wf_vblank:
- shard-kbl: DMESG-WARN [fdo#103558] / [fdo#105602] -> PASS +8
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-kbl: FAIL [fdo#103167] -> PASS
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render:
- shard-apl: FAIL [fdo#103167] -> PASS +1
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-mmap-cpu:
- shard-glk: FAIL [fdo#103167] -> PASS +2
* {igt@kms_plane@pixel-format-pipe-b-planes-source-clamping}:
- shard-apl: FAIL [fdo#108948] -> PASS +1
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max:
- shard-glk: FAIL [fdo#108145] -> PASS +1
- shard-kbl: FAIL [fdo#108145] -> PASS
- shard-apl: FAIL [fdo#108145] -> PASS
* igt@kms_plane_multiple@atomic-pipe-a-tiling-yf:
- shard-glk: FAIL [fdo#103166] -> PASS
* igt@kms_plane_multiple@atomic-pipe-b-tiling-x:
- shard-apl: FAIL [fdo#103166] -> PASS +2
- shard-kbl: FAIL [fdo#103166] -> PASS
#### Warnings ####
* {igt@kms_rotation_crc@multiplane-rotation-cropping-top}:
- shard-kbl: DMESG-FAIL [fdo#108950] -> DMESG-WARN [fdo#105604]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103558]: https://bugs.freedesktop.org/show_bug.cgi?id=103558
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
[fdo#105010]: https://bugs.freedesktop.org/show_bug.cgi?id=105010
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#105604]: https://bugs.freedesktop.org/show_bug.cgi?id=105604
[fdo#106641]: https://bugs.freedesktop.org/show_bug.cgi?id=106641
[fdo#107469]: https://bugs.freedesktop.org/show_bug.cgi?id=107469
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108147]: https://bugs.freedesktop.org/show_bug.cgi?id=108147
[fdo#108888]: https://bugs.freedesktop.org/show_bug.cgi?id=108888
[fdo#108948]: https://bugs.freedesktop.org/show_bug.cgi?id=108948
[fdo#108950]: https://bugs.freedesktop.org/show_bug.cgi?id=108950
Participating hosts (7 -> 5)
------------------------------
Missing (2): shard-skl shard-iclb
Build changes
-------------
* IGT: IGT_4743 -> IGTPW_2136
* Piglit: piglit_4509 -> None
CI_DRM_5286: 47717a5a4d159f980da051acd168f2c40dbc6736 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2136: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2136/
IGT_4743: edb2db2cf2b6665d7ba3fa9117263302f6307a4f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2136/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-12-07 22:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-07 14:01 [igt-dev] [PATCH RESEND] lib/kms: Enable outputs by default in igt_require_display Daniel Vetter
2018-12-07 14:21 ` Maarten Lankhorst
2018-12-07 15:00 ` Daniel Vetter
2018-12-07 15:14 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2018-12-07 22:15 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox