* [PATCH i-g-t 1/2] kms_flip: Shorten basic tests a bit
@ 2016-04-22 15:16 Tvrtko Ursulin
2016-04-22 15:16 ` [PATCH i-g-t 2/2] kms_flip: Run basic tests only on one pipe Tvrtko Ursulin
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Tvrtko Ursulin @ 2016-04-22 15:16 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Seems like an overkill for a basic test to keep flipping for
a full minute. Dial it down a bit.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
tests/kms_flip.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index 3d4454407709..1e7336e1ba95 100644
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -1626,20 +1626,20 @@ int main(int argc, char **argv)
"blt-wf_vblank-vs-modeset" },
{ 60, TEST_VBLANK | TEST_MODESET | TEST_WITH_DUMMY_RCS,
"rcs-wf_vblank-vs-modeset" },
- { 30, TEST_FLIP | TEST_BASIC, "plain-flip" },
+ { 10, TEST_FLIP | TEST_BASIC, "plain-flip" },
{ 30, TEST_FLIP | TEST_EBUSY , "busy-flip" },
{ 30, TEST_FLIP | TEST_FENCE_STRESS , "flip-vs-fences" },
{ 30, TEST_FLIP | TEST_CHECK_TS, "plain-flip-ts-check" },
{ 30, TEST_FLIP | TEST_CHECK_TS | TEST_FB_RECREATE,
"plain-flip-fb-recreate" },
{ 30, TEST_FLIP | TEST_RMFB | TEST_MODESET , "flip-vs-rmfb" },
- { 60, TEST_FLIP | TEST_DPMS | TEST_EINVAL | TEST_BASIC, "flip-vs-dpms" },
+ { 20, TEST_FLIP | TEST_DPMS | TEST_EINVAL | TEST_BASIC, "flip-vs-dpms" },
{ 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_BCS, "blt-flip-vs-dpms" },
{ 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_RCS, "render-flip-vs-dpms" },
{ 30, TEST_FLIP | TEST_PAN, "flip-vs-panning" },
{ 60, TEST_FLIP | TEST_PAN | TEST_WITH_DUMMY_BCS, "blt-flip-vs-panning" },
{ 60, TEST_FLIP | TEST_PAN | TEST_WITH_DUMMY_RCS, "render-flip-vs-panning" },
- { 60, TEST_FLIP | TEST_MODESET | TEST_EINVAL | TEST_BASIC, "flip-vs-modeset" },
+ { 20, TEST_FLIP | TEST_MODESET | TEST_EINVAL | TEST_BASIC, "flip-vs-modeset" },
{ 60, TEST_FLIP | TEST_MODESET | TEST_WITH_DUMMY_BCS, "blt-flip-vs-modeset" },
{ 60, TEST_FLIP | TEST_MODESET | TEST_WITH_DUMMY_RCS, "render-flip-vs-modeset" },
{ 30, TEST_FLIP | TEST_VBLANK_EXPIRED_SEQ,
@@ -1647,7 +1647,7 @@ int main(int argc, char **argv)
{ 30, TEST_FLIP | TEST_VBLANK | TEST_VBLANK_ABSOLUTE |
TEST_CHECK_TS, "flip-vs-absolute-wf_vblank" },
- { 30, TEST_FLIP | TEST_VBLANK | TEST_CHECK_TS | TEST_BASIC,
+ { 10, TEST_FLIP | TEST_VBLANK | TEST_CHECK_TS | TEST_BASIC,
"flip-vs-wf_vblank" },
{ 30, TEST_FLIP | TEST_VBLANK | TEST_VBLANK_BLOCK |
TEST_CHECK_TS, "flip-vs-blocking-wf-vblank" },
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH i-g-t 2/2] kms_flip: Run basic tests only on one pipe
2016-04-22 15:16 [PATCH i-g-t 1/2] kms_flip: Shorten basic tests a bit Tvrtko Ursulin
@ 2016-04-22 15:16 ` Tvrtko Ursulin
2016-04-25 8:54 ` Daniel Vetter
2016-04-25 8:52 ` [PATCH i-g-t 1/2] kms_flip: Shorten basic tests a bit Daniel Vetter
2016-04-25 10:22 ` Marius Vlad
2 siblings, 1 reply; 5+ messages in thread
From: Tvrtko Ursulin @ 2016-04-22 15:16 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
It brings enough value for the basic test set to check
one connector with one pipe only, rather every connector
with all possible pipes.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
tests/kms_flip.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index 1e7336e1ba95..992c59b53fb9 100644
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -1283,7 +1283,7 @@ static void free_test_output(struct test_output *o)
}
}
-static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
+static bool run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
int crtc_count, int duration_ms)
{
char test_name[128];
@@ -1296,7 +1296,7 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
case 1:
connector_find_preferred_mode(o->_connector[0], crtc_idxs[0], o);
if (!o->mode_valid)
- return;
+ return false;
snprintf(test_name, sizeof(test_name),
"%s on pipe %s, connector %s-%d",
igt_subtest_name(),
@@ -1307,7 +1307,7 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
case 2:
connector_find_compatible_mode(crtc_idxs[0], crtc_idxs[1], o);
if (!o->mode_valid)
- return;
+ return false;
snprintf(test_name, sizeof(test_name),
"%s on pipe %s:%s, connector %s-%d:%s-%d",
igt_subtest_name(),
@@ -1422,6 +1422,8 @@ out:
last_connector = NULL;
free_test_output(o);
+
+ return true;
}
static int run_test(int duration, int flags)
@@ -1454,6 +1456,9 @@ static int run_test(int duration, int flags)
modes++;
free_test_output(&o);
+
+ if ((flags & TEST_BASIC) && modes > 0)
+ break;
}
}
@@ -1462,6 +1467,7 @@ static int run_test(int duration, int flags)
duration = max(500, duration);
/* Find any connected displays */
+ modes = 0;
for (i = 0; i < resources->count_connectors; i++) {
for (n = 0; n < resources->count_crtcs; n++) {
int crtc_idx;
@@ -1476,7 +1482,11 @@ static int run_test(int duration, int flags)
o.depth = 24;
crtc_idx = n;
- run_test_on_crtc_set(&o, &crtc_idx, 1, duration);
+ if (run_test_on_crtc_set(&o, &crtc_idx, 1, duration))
+ modes++;
+
+ if ((flags & TEST_BASIC) && modes > 0)
+ break;
}
}
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH i-g-t 1/2] kms_flip: Shorten basic tests a bit
2016-04-22 15:16 [PATCH i-g-t 1/2] kms_flip: Shorten basic tests a bit Tvrtko Ursulin
2016-04-22 15:16 ` [PATCH i-g-t 2/2] kms_flip: Run basic tests only on one pipe Tvrtko Ursulin
@ 2016-04-25 8:52 ` Daniel Vetter
2016-04-25 10:22 ` Marius Vlad
2 siblings, 0 replies; 5+ messages in thread
From: Daniel Vetter @ 2016-04-25 8:52 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: Intel-gfx
On Fri, Apr 22, 2016 at 04:16:15PM +0100, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> Seems like an overkill for a basic test to keep flipping for
> a full minute. Dial it down a bit.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Ack.
-Daniel
> ---
> tests/kms_flip.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tests/kms_flip.c b/tests/kms_flip.c
> index 3d4454407709..1e7336e1ba95 100644
> --- a/tests/kms_flip.c
> +++ b/tests/kms_flip.c
> @@ -1626,20 +1626,20 @@ int main(int argc, char **argv)
> "blt-wf_vblank-vs-modeset" },
> { 60, TEST_VBLANK | TEST_MODESET | TEST_WITH_DUMMY_RCS,
> "rcs-wf_vblank-vs-modeset" },
> - { 30, TEST_FLIP | TEST_BASIC, "plain-flip" },
> + { 10, TEST_FLIP | TEST_BASIC, "plain-flip" },
> { 30, TEST_FLIP | TEST_EBUSY , "busy-flip" },
> { 30, TEST_FLIP | TEST_FENCE_STRESS , "flip-vs-fences" },
> { 30, TEST_FLIP | TEST_CHECK_TS, "plain-flip-ts-check" },
> { 30, TEST_FLIP | TEST_CHECK_TS | TEST_FB_RECREATE,
> "plain-flip-fb-recreate" },
> { 30, TEST_FLIP | TEST_RMFB | TEST_MODESET , "flip-vs-rmfb" },
> - { 60, TEST_FLIP | TEST_DPMS | TEST_EINVAL | TEST_BASIC, "flip-vs-dpms" },
> + { 20, TEST_FLIP | TEST_DPMS | TEST_EINVAL | TEST_BASIC, "flip-vs-dpms" },
> { 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_BCS, "blt-flip-vs-dpms" },
> { 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_RCS, "render-flip-vs-dpms" },
> { 30, TEST_FLIP | TEST_PAN, "flip-vs-panning" },
> { 60, TEST_FLIP | TEST_PAN | TEST_WITH_DUMMY_BCS, "blt-flip-vs-panning" },
> { 60, TEST_FLIP | TEST_PAN | TEST_WITH_DUMMY_RCS, "render-flip-vs-panning" },
> - { 60, TEST_FLIP | TEST_MODESET | TEST_EINVAL | TEST_BASIC, "flip-vs-modeset" },
> + { 20, TEST_FLIP | TEST_MODESET | TEST_EINVAL | TEST_BASIC, "flip-vs-modeset" },
> { 60, TEST_FLIP | TEST_MODESET | TEST_WITH_DUMMY_BCS, "blt-flip-vs-modeset" },
> { 60, TEST_FLIP | TEST_MODESET | TEST_WITH_DUMMY_RCS, "render-flip-vs-modeset" },
> { 30, TEST_FLIP | TEST_VBLANK_EXPIRED_SEQ,
> @@ -1647,7 +1647,7 @@ int main(int argc, char **argv)
>
> { 30, TEST_FLIP | TEST_VBLANK | TEST_VBLANK_ABSOLUTE |
> TEST_CHECK_TS, "flip-vs-absolute-wf_vblank" },
> - { 30, TEST_FLIP | TEST_VBLANK | TEST_CHECK_TS | TEST_BASIC,
> + { 10, TEST_FLIP | TEST_VBLANK | TEST_CHECK_TS | TEST_BASIC,
> "flip-vs-wf_vblank" },
> { 30, TEST_FLIP | TEST_VBLANK | TEST_VBLANK_BLOCK |
> TEST_CHECK_TS, "flip-vs-blocking-wf-vblank" },
> --
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH i-g-t 2/2] kms_flip: Run basic tests only on one pipe
2016-04-22 15:16 ` [PATCH i-g-t 2/2] kms_flip: Run basic tests only on one pipe Tvrtko Ursulin
@ 2016-04-25 8:54 ` Daniel Vetter
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Vetter @ 2016-04-25 8:54 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: Intel-gfx
On Fri, Apr 22, 2016 at 04:16:16PM +0100, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> It brings enough value for the basic test set to check
> one connector with one pipe only, rather every connector
> with all possible pipes.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Unfortuantely we've broken this a few too many times. I kid you not, but
before this testcase page_flip tended to indeed only work on pipe A. Also
vlv/chv have hilarious "this output only works on pipe C" restrictions.
I think at least one pageflip+vblank ts testcase must run on all pipes to
have full coverage. The others we could reduce indeed.
> ---
> tests/kms_flip.c | 18 ++++++++++++++----
> 1 file changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/tests/kms_flip.c b/tests/kms_flip.c
> index 1e7336e1ba95..992c59b53fb9 100644
> --- a/tests/kms_flip.c
> +++ b/tests/kms_flip.c
> @@ -1283,7 +1283,7 @@ static void free_test_output(struct test_output *o)
> }
> }
>
> -static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
> +static bool run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
> int crtc_count, int duration_ms)
> {
> char test_name[128];
> @@ -1296,7 +1296,7 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
> case 1:
> connector_find_preferred_mode(o->_connector[0], crtc_idxs[0], o);
> if (!o->mode_valid)
> - return;
> + return false;
> snprintf(test_name, sizeof(test_name),
> "%s on pipe %s, connector %s-%d",
> igt_subtest_name(),
> @@ -1307,7 +1307,7 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
> case 2:
> connector_find_compatible_mode(crtc_idxs[0], crtc_idxs[1], o);
> if (!o->mode_valid)
> - return;
> + return false;
> snprintf(test_name, sizeof(test_name),
> "%s on pipe %s:%s, connector %s-%d:%s-%d",
> igt_subtest_name(),
> @@ -1422,6 +1422,8 @@ out:
> last_connector = NULL;
>
> free_test_output(o);
> +
> + return true;
> }
>
> static int run_test(int duration, int flags)
> @@ -1454,6 +1456,9 @@ static int run_test(int duration, int flags)
> modes++;
>
> free_test_output(&o);
> +
> + if ((flags & TEST_BASIC) && modes > 0)
> + break;
> }
> }
>
> @@ -1462,6 +1467,7 @@ static int run_test(int duration, int flags)
> duration = max(500, duration);
>
> /* Find any connected displays */
> + modes = 0;
> for (i = 0; i < resources->count_connectors; i++) {
> for (n = 0; n < resources->count_crtcs; n++) {
> int crtc_idx;
> @@ -1476,7 +1482,11 @@ static int run_test(int duration, int flags)
> o.depth = 24;
>
> crtc_idx = n;
> - run_test_on_crtc_set(&o, &crtc_idx, 1, duration);
> + if (run_test_on_crtc_set(&o, &crtc_idx, 1, duration))
> + modes++;
> +
> + if ((flags & TEST_BASIC) && modes > 0)
> + break;
> }
> }
>
> --
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH i-g-t 1/2] kms_flip: Shorten basic tests a bit
2016-04-22 15:16 [PATCH i-g-t 1/2] kms_flip: Shorten basic tests a bit Tvrtko Ursulin
2016-04-22 15:16 ` [PATCH i-g-t 2/2] kms_flip: Run basic tests only on one pipe Tvrtko Ursulin
2016-04-25 8:52 ` [PATCH i-g-t 1/2] kms_flip: Shorten basic tests a bit Daniel Vetter
@ 2016-04-25 10:22 ` Marius Vlad
2 siblings, 0 replies; 5+ messages in thread
From: Marius Vlad @ 2016-04-25 10:22 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: Intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 2782 bytes --]
Thanks. Pushed.
On Fri, Apr 22, 2016 at 04:16:15PM +0100, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> Seems like an overkill for a basic test to keep flipping for
> a full minute. Dial it down a bit.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
> tests/kms_flip.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tests/kms_flip.c b/tests/kms_flip.c
> index 3d4454407709..1e7336e1ba95 100644
> --- a/tests/kms_flip.c
> +++ b/tests/kms_flip.c
> @@ -1626,20 +1626,20 @@ int main(int argc, char **argv)
> "blt-wf_vblank-vs-modeset" },
> { 60, TEST_VBLANK | TEST_MODESET | TEST_WITH_DUMMY_RCS,
> "rcs-wf_vblank-vs-modeset" },
> - { 30, TEST_FLIP | TEST_BASIC, "plain-flip" },
> + { 10, TEST_FLIP | TEST_BASIC, "plain-flip" },
> { 30, TEST_FLIP | TEST_EBUSY , "busy-flip" },
> { 30, TEST_FLIP | TEST_FENCE_STRESS , "flip-vs-fences" },
> { 30, TEST_FLIP | TEST_CHECK_TS, "plain-flip-ts-check" },
> { 30, TEST_FLIP | TEST_CHECK_TS | TEST_FB_RECREATE,
> "plain-flip-fb-recreate" },
> { 30, TEST_FLIP | TEST_RMFB | TEST_MODESET , "flip-vs-rmfb" },
> - { 60, TEST_FLIP | TEST_DPMS | TEST_EINVAL | TEST_BASIC, "flip-vs-dpms" },
> + { 20, TEST_FLIP | TEST_DPMS | TEST_EINVAL | TEST_BASIC, "flip-vs-dpms" },
> { 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_BCS, "blt-flip-vs-dpms" },
> { 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_RCS, "render-flip-vs-dpms" },
> { 30, TEST_FLIP | TEST_PAN, "flip-vs-panning" },
> { 60, TEST_FLIP | TEST_PAN | TEST_WITH_DUMMY_BCS, "blt-flip-vs-panning" },
> { 60, TEST_FLIP | TEST_PAN | TEST_WITH_DUMMY_RCS, "render-flip-vs-panning" },
> - { 60, TEST_FLIP | TEST_MODESET | TEST_EINVAL | TEST_BASIC, "flip-vs-modeset" },
> + { 20, TEST_FLIP | TEST_MODESET | TEST_EINVAL | TEST_BASIC, "flip-vs-modeset" },
> { 60, TEST_FLIP | TEST_MODESET | TEST_WITH_DUMMY_BCS, "blt-flip-vs-modeset" },
> { 60, TEST_FLIP | TEST_MODESET | TEST_WITH_DUMMY_RCS, "render-flip-vs-modeset" },
> { 30, TEST_FLIP | TEST_VBLANK_EXPIRED_SEQ,
> @@ -1647,7 +1647,7 @@ int main(int argc, char **argv)
>
> { 30, TEST_FLIP | TEST_VBLANK | TEST_VBLANK_ABSOLUTE |
> TEST_CHECK_TS, "flip-vs-absolute-wf_vblank" },
> - { 30, TEST_FLIP | TEST_VBLANK | TEST_CHECK_TS | TEST_BASIC,
> + { 10, TEST_FLIP | TEST_VBLANK | TEST_CHECK_TS | TEST_BASIC,
> "flip-vs-wf_vblank" },
> { 30, TEST_FLIP | TEST_VBLANK | TEST_VBLANK_BLOCK |
> TEST_CHECK_TS, "flip-vs-blocking-wf-vblank" },
> --
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-04-25 10:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-22 15:16 [PATCH i-g-t 1/2] kms_flip: Shorten basic tests a bit Tvrtko Ursulin
2016-04-22 15:16 ` [PATCH i-g-t 2/2] kms_flip: Run basic tests only on one pipe Tvrtko Ursulin
2016-04-25 8:54 ` Daniel Vetter
2016-04-25 8:52 ` [PATCH i-g-t 1/2] kms_flip: Shorten basic tests a bit Daniel Vetter
2016-04-25 10:22 ` Marius Vlad
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox