Skip to contentSkip to conversation

tests/kms_frontbuffer_tracking: Skip tests when PSR cannot be enabled

PATCH Superseded Dhinakaran Pandiyan 4 participants 7 messages Oct 26, 2017

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/kms_frontbuffer_tracking: Skip tests when PSR cannot be enabled

The frontbuffer_tracking PSR tests fail if PSR cannot be activated when there is sink support. But, there are several other requirements related to mode timings that have to be satisfied before PSR can be enabled. No reason to fail these tests when PSR cannot be enabled.

---
 tests/kms_frontbuffer_tracking.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
tests/kms_frontbuffer_tracking.c +4 -4
index a068c8af..13c948de 100644
@@ -1548,12 +1548,12 @@ static void teardown_fbc(void)
 {
 }
 
-static bool psr_sink_has_support(void)
+static bool psr_has_support(void)
 {
 	char buf[256];
 
 	debugfs_read("i915_edp_psr_status", buf);
-	return strstr(buf, "Sink_Support: yes\n");
+	return strstr(buf, "Enabled: yes\n");
 }
 
 static void setup_psr(void)
@@ -1564,8 +1564,8 @@ static void setup_psr(void)
 		return;
 	}
 
-	if (!psr_sink_has_support()) {
-		igt_info("Can't test PSR: not supported by sink.\n");
+	if (!psr_has_support()) {
+		igt_info("Can't test PSR: not supported.\n");
 		return;
 	}
 	psr.can_test = true;
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✓ Fi.CI.BAT: success for tests/kms_frontbuffer_tracking: Skip tests when PSR cannot be enabled

== Series Details ==

== Series Details ==

Series: tests/kms_frontbuffer_tracking: Skip tests when PSR cannot be enabled
URL : https://patchwork.freedesktop.org/series/32667/
State : success

== Summary ==

IGT patchset tested on top of latest successful build 12ee485a1e23bd49b754751fa82859012f751a1a igt/drv_hangman: Skip aliased I915_EXEC_BSD

with latest DRM-Tip kernel build CI_DRM_3285
2ea0b3d47030 drm-tip: 2017y-10m-25d-18h-42m-20s UTC integration manifest

No testlist changes.

Test drv_module_reload:

        Subgroup basic-reload-inject:
                dmesg-warn -> INCOMPLETE (fi-cfl-s) fdo#103206

fdo#103206 https://bugs.freedesktop.org/show_bug.cgi?id=103206

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:447s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:450s
fi-blb-e6850     total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:375s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:519s
fi-bwr-2160      total:289  pass:183  dwarn:0   dfail:0   fail:0   skip:106 time:266s
fi-bxt-dsi       total:289  pass:259  dwarn:0   dfail:0   fail:0   skip:30  time:498s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:500s
fi-byt-j1900     total:289  pass:253  dwarn:1   dfail:0   fail:0   skip:35  time:495s
fi-byt-n2820     total:289  pass:249  dwarn:1   dfail:0   fail:0   skip:39  time:480s
fi-cfl-s         total:288  pass:253  dwarn:3   dfail:0   fail:0   skip:31 
fi-cnl-y         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:598s
fi-elk-e7500     total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:417s
fi-gdg-551       total:289  pass:178  dwarn:1   dfail:0   fail:1   skip:109 time:251s
fi-glk-1         total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:578s
fi-glk-dsi       total:289  pass:258  dwarn:0   dfail:0   fail:1   skip:30  time:487s
fi-hsw-4770      total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:435s
fi-hsw-4770r     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:429s
fi-ilk-650       total:289  pass:228  dwarn:0   dfail:0   fail:0   skip:61  time:435s
fi-ivb-3520m     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:490s
fi-ivb-3770      total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:457s
fi-kbl-7500u     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:491s
fi-kbl-7560u     total:289  pass:270  dwarn:0   dfail:0   fail:0   skip:19  time:576s
fi-kbl-7567u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:479s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:583s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:451s
fi-skl-6600u     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:590s
fi-skl-6700hq    total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:651s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:521s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:510s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:458s
fi-snb-2520m     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:570s
fi-snb-2600      total:289  pass:249  dwarn:0   dfail:0   fail:0   skip:40  time:419s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_424/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

✓ Fi.CI.IGT: success for tests/kms_frontbuffer_tracking: Skip tests when PSR cannot be enabled

In reply to Dhinakaran Pandiyan
== Series Details ==

== Series Details ==

Series: tests/kms_frontbuffer_tracking: Skip tests when PSR cannot be enabled
URL : https://patchwork.freedesktop.org/series/32667/
State : success

== Summary ==

Test kms_busy:

        Subgroup extended-modeset-hang-newfb-with-reset-render-A:
                pass       -> DMESG-WARN (shard-hsw) fdo#102249 +3
Test drv_suspend:
        Subgroup fence-restore-untiled-hibernate:
                dmesg-fail -> FAIL       (shard-hsw) k.org#196691
Test drv_module_reload:
        Subgroup basic-no-display:
                pass       -> DMESG-WARN (shard-hsw) fdo#102707
Test kms_cursor_legacy:
        Subgroup flip-vs-cursor-legacy:
                fail       -> PASS       (shard-hsw) fdo#102670
Test perf:
        Subgroup oa-exponents:
                pass       -> FAIL       (shard-hsw) fdo#102254
Test kms_setmode:
        Subgroup basic:
                pass       -> FAIL       (shard-hsw) fdo#99912

fdo#102249 https://bugs.freedesktop.org/show_bug.cgi?id=102249
k.org#196691 https://bugzilla.kernel.org/show_bug.cgi?id=196691
fdo#102707 https://bugs.freedesktop.org/show_bug.cgi?id=102707
fdo#102670 https://bugs.freedesktop.org/show_bug.cgi?id=102670
fdo#102254 https://bugs.freedesktop.org/show_bug.cgi?id=102254
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912

shard-hsw total:2539 pass:1429 dwarn:3 dfail:0 fail:10 skip:1097 time:9130s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_424/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw
In reply to Dhinakaran Pandiyan

Em Qua, 2017-10-25 às 17:37 -0700, Dhinakaran Pandiyan escreveu:

Quoted 30 lines

The frontbuffer_tracking PSR tests fail if PSR cannot be activated when
there is sink support. But, there are several other requirements related to
mode timings that have to be satisfied before PSR can be enabled. No reason
to fail these tests when PSR cannot be enabled.

---
 tests/kms_frontbuffer_tracking.c | 8 ++++----

 1 file changed, 4 insertions(+), 4 deletions(-)
tests/kms_frontbuffer_tracking.c +0 -0
index a068c8af..13c948de 100644
@@ -1548,12 +1548,12 @@ static void teardown_fbc(void)
  {
  }

tests/kms_frontbuffer_tracking.c +1 -1
-static bool psr_sink_has_support(void)
+static bool psr_has_support(void)

 {
  char buf[256];

  debugfs_read("i915_edp_psr_status", buf);

tests/kms_frontbuffer_tracking.c static void teardown_fbc(void) · line 1556

Quoted 2 lines
tests/kms_frontbuffer_tracking.c +1 -1
-	return strstr(buf, "Sink_Support: yes\n");
+	return strstr(buf, "Enabled: yes\n");

What if PSR can be enabled but is just not enabled due to a bug?

I suppose we could print on debugfs whether source+sink support equals yes.

Quoted 12 lines

 }

 static void setup_psr(void)

tests/kms_frontbuffer_tracking.c +0 -0
@@ -1564,8 +1564,8 @@ static void setup_psr(void)
  		return;
  	}

tests/kms_frontbuffer_tracking.c +0 -2
-	if (!psr_sink_has_support()) {
-		igt_info("Can't test PSR: not supported by

sink.\n");

tests/kms_frontbuffer_tracking.c +2 -0
+	if (!psr_has_support()) {
+		igt_info("Can't test PSR: not supported.\n");
Quoted 3 lines

  return;
  }
  psr.can_test = true;

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw
Quoted 27 lines · Paulo Zanoni

Em Qua, 2017-10-25 às 17:37 -0700, Dhinakaran Pandiyan escreveu:

Quoted 26 lines

The frontbuffer_tracking PSR tests fail if PSR cannot be activated when
there is sink support. But, there are several other requirements related to
mode timings that have to be satisfied before PSR can be enabled. No reason
to fail these tests when PSR cannot be enabled.

---
 tests/kms_frontbuffer_tracking.c | 8 ++++----

 1 file changed, 4 insertions(+), 4 deletions(-)
tests/kms_frontbuffer_tracking.c +0 -0
index a068c8af..13c948de 100644
@@ -1548,12 +1548,12 @@ static void teardown_fbc(void)
  {
  }

tests/kms_frontbuffer_tracking.c +1 -1
-static bool psr_sink_has_support(void)
+static bool psr_has_support(void)
Quoted 8 lines

tests/kms_frontbuffer_tracking.c static void teardown_fbc(void) · line 1556

Quoted 6 lines

 {
  char buf[256];

  debugfs_read("i915_edp_psr_status", buf);

tests/kms_frontbuffer_tracking.c +1 -1
-	return strstr(buf, "Sink_Support: yes\n");
+	return strstr(buf, "Enabled: yes\n");

What if PSR can be enabled but is just not enabled due to a bug?

then psr basic should be the one failing...

Quoted 3 lines

I suppose we could print on debugfs whether source+sink support equals yes.

or maybe here instead of sink: yes or enable: yes
we could check
sink: yes && source: yes

if sink yes and source yes and psr is still disabled when we expect that enabled than we have the bug paulo mentioned.

Quoted 16 lines
Quoted 13 lines

 }

 static void setup_psr(void)

tests/kms_frontbuffer_tracking.c +0 -0
@@ -1564,8 +1564,8 @@ static void setup_psr(void)
  		return;
  	}

tests/kms_frontbuffer_tracking.c +0 -2
-	if (!psr_sink_has_support()) {
-		igt_info("Can't test PSR: not supported by

sink.\n");

tests/kms_frontbuffer_tracking.c +2 -0
+	if (!psr_has_support()) {
+		igt_info("Can't test PSR: not supported.\n");
Quoted 3 lines

  return;
  }
  psr.can_test = true;

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

Em Qui, 2017-10-26 às 12:32 -0700, Rodrigo Vivi escreveu:

Quoted 40 lines · Paulo Zanoni
Quoted 30 lines

Em Qua, 2017-10-25 às 17:37 -0700, Dhinakaran Pandiyan escreveu:

Quoted 29 lines

The frontbuffer_tracking PSR tests fail if PSR cannot be activated
when
there is sink support. But, there are several other requirements related to
mode timings that have to be satisfied before PSR can be enabled. No
reason
to fail these tests when PSR cannot be enabled.

Cc Paulo Zanoni <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Quoted 1 line

---
 tests/kms_frontbuffer_tracking.c | 8 ++++----

 1 file changed, 4 insertions(+), 4 deletions(-)
tests/kms_frontbuffer_tracking.c +0 -0
index a068c8af..13c948de 100644
@@ -1548,12 +1548,12 @@ static void teardown_fbc(void)
  {
  }

tests/kms_frontbuffer_tracking.c +1 -1
-static bool psr_sink_has_support(void)
+static bool psr_has_support(void)
Quoted 8 lines

tests/kms_frontbuffer_tracking.c static void teardown_fbc(void) · line 1556

Quoted 6 lines

 {
  char buf[256];

  debugfs_read("i915_edp_psr_status", buf);

tests/kms_frontbuffer_tracking.c +1 -1
-	return strstr(buf, "Sink_Support: yes\n");
+	return strstr(buf, "Enabled: yes\n");

What if PSR can be enabled but is just not enabled due to a bug?

Quoted 1 line

then psr basic should be the one failing...

But if we apply this patch we'll skip it instead of fail.

Quoted 14 lines
Quoted 5 lines

I suppose we could print on debugfs whether source+sink support equals
yes.

or maybe here instead of sink: yes or enable: yes
we could check
sink: yes && source: yes

if sink yes and source yes and psr is still disabled when we expect that enabled than we have the bug paulo mentioned.

Quoted 1 line
Quoted 15 lines
Quoted 7 lines
Quoted 7 lines

 }

 static void setup_psr(void)

tests/kms_frontbuffer_tracking.c +0 -0
@@ -1564,8 +1564,8 @@ static void setup_psr(void)
  		return;
  	}

Quoted 8 lines
Quoted 8 lines
tests/kms_frontbuffer_tracking.c +0 -2
-	if (!psr_sink_has_support()) {
-		igt_info("Can't test PSR: not supported by

sink.\n");

tests/kms_frontbuffer_tracking.c +2 -0
+	if (!psr_has_support()) {
+		igt_info("Can't test PSR: not supported.\n");

  return;
  }
  psr.can_test = true;

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw
Quoted 40 lines · Paulo Zanoni

Em Qui, 2017-10-26 às 12:32 -0700, Rodrigo Vivi escreveu:

Quoted 39 lines · Paulo Zanoni
Quoted 38 lines

Em Qua, 2017-10-25 às 17:37 -0700, Dhinakaran Pandiyan escreveu:

Quoted 25 lines

The frontbuffer_tracking PSR tests fail if PSR cannot be activated
when
there is sink support. But, there are several other requirements related to
mode timings that have to be satisfied before PSR can be enabled. No
reason
to fail these tests when PSR cannot be enabled.

Cc Paulo Zanoni <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Quoted 1 line
---
 tests/kms_frontbuffer_tracking.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
tests/kms_frontbuffer_tracking.c +0 -0
index a068c8af..13c948de 100644
@@ -1548,12 +1548,12 @@ static void teardown_fbc(void)
 {

tests/kms_frontbuffer_tracking.c static void teardown_fbc(void) · line 1556

Quoted 10 lines
tests/kms_frontbuffer_tracking.c +2 -2
 }
 
-static bool psr_sink_has_support(void)
+static bool psr_has_support(void)
 {
 	char buf[256];
 
 	debugfs_read("i915_edp_psr_status", buf);
-	return strstr(buf, "Sink_Support: yes\n");
+	return strstr(buf, "Enabled: yes\n");

What if PSR can be enabled but is just not enabled due to a bug?

My reasoning was psr.enabled will be true as long as intel_psr_enable() is called. But, yeah there is a chance that intel_psr_enable() is not called.

Quoted 15 lines
Quoted 2 lines

then psr basic should be the one failing...

But if we apply this patch we'll skip it instead of fail.

Quoted 10 lines
Quoted 5 lines

I suppose we could print on debugfs whether source+sink support equals
yes.

or maybe here instead of sink: yes or enable: yes
we could check
sink: yes && source: yes

That's how I wrote this initially, but source_ok appears to be in the wrong place in the driver, i.e., source_ok is set inside psr_enable() and hence has the same effect as checking for enabled. Moving source_ok = true inside psr_compute_config() and changing the IGT to test for sink_support && source_ok will solve our problem.

Quoted 11 lines
Quoted 11 lines

if sink yes and source yes and psr is still disabled when we expect that enabled than we have the bug paulo mentioned.

Quoted 8 lines
Quoted 8 lines
tests/kms_frontbuffer_tracking.c +0 -0
 }
 
 static void setup_psr(void)
@@ -1564,8 +1564,8 @@ static void setup_psr(void)
 		return;
 	}
 
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
tests/kms_frontbuffer_tracking.c +2 -2
-	if (!psr_sink_has_support()) {
-		igt_info("Can't test PSR: not supported by
 sink.\n");
+	if (!psr_has_support()) {
+		igt_info("Can't test PSR: not supported.\n");
 		return;
 	}

psr.can_test = true;

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx