Skip to contentSkip to conversation

igt/kms_psr_sink_crc: Add psr_drrs subtest

igt Applied Radhakrishna Sripada 6 participants 9 messages Sep 15, 2017 – Sep 20, 2017

lore
Share & tools
lore
#0 lore raw

Platforms do not support psr and drrs simultaneously. Adding a subtest to make the check.

---
 tests/kms_psr_sink_crc.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
tests/kms_psr_sink_crc.c +14 -0
index bd3fa5e94d85..1c25f2c81a34 100644
@@ -284,6 +284,15 @@ static void assert_or_manual(bool condition, const char *expected)
 	igt_assert(igt_interactive_debug || condition);
 }
 
+static bool drrs_disabled(data_t *data)
+{
+	char buf[512];
+
+	igt_debugfs_read(data->drm_fd, "i915_drrs_status", buf);
+
+	return strstr(buf, "DRRS Support: No\n");
+}
+
 static void run_test(data_t *data)
 {
 	uint32_t handle = data->fb_white.gem_handle;
@@ -524,6 +533,11 @@ int main(int argc, char *argv[])
 		igt_assert(wait_psr_entry(&data));
 	}
 
+	igt_subtest("psr_drrs") {
+		setup_test_plane(&data);
+		igt_assert(drrs_disabled(&data));
+	}
+
 	for (op = PAGE_FLIP; op <= RENDER; op++) {
 		igt_subtest_f("primary_%s", op_str(op)) {
 			data.test_plane = DRM_PLANE_TYPE_PRIMARY;
Signature · 6 lines
2.9.3

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

✓ Fi.CI.BAT: success for igt/kms_psr_sink_crc: Add psr_drrs subtest

== Series Details ==

== Series Details ==

Series: igt/kms_psr_sink_crc: Add psr_drrs subtest
URL : https://patchwork.freedesktop.org/series/30460/
State : success

== Summary ==

IGT patchset tested on top of latest successful build 93f72b23156589964b87bb9ca7c94c104976303c meson: Process intel_aubdump.in into intel_aubdump

with latest DRM-Tip kernel build CI_DRM_3094
9adc9e93d624 drm-tip: 2017y-09m-15d-11h-44m-46s UTC integration manifest

Test chamelium:

        Subgroup dp-crc-fast:
                pass       -> FAIL       (fi-kbl-7500u) fdo#102514

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

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:445s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:457s
fi-blb-e6850     total:289  pass:224  dwarn:1   dfail:0   fail:0   skip:64  time:382s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:537s
fi-bwr-2160      total:289  pass:184  dwarn:0   dfail:0   fail:0   skip:105 time:271s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:506s
fi-byt-j1900     total:289  pass:254  dwarn:1   dfail:0   fail:0   skip:34  time:515s
fi-byt-n2820     total:289  pass:250  dwarn:1   dfail:0   fail:0   skip:38  time:512s
fi-cfl-s         total:289  pass:223  dwarn:34  dfail:0   fail:0   skip:32  time:550s
fi-elk-e7500     total:289  pass:230  dwarn:0   dfail:0   fail:0   skip:59  time:432s
fi-glk-2a        total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:598s
fi-hsw-4770      total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:432s
fi-hsw-4770r     total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:411s
fi-ilk-650       total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:443s
fi-ivb-3520m     total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:489s
fi-ivb-3770      total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:469s
fi-kbl-7500u     total:289  pass:263  dwarn:1   dfail:0   fail:1   skip:24  time:482s
fi-kbl-7560u     total:289  pass:270  dwarn:0   dfail:0   fail:0   skip:19  time:583s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:588s
fi-pnv-d510      total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:560s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:463s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:530s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:503s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:465s
fi-skl-x1585l    total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:496s
fi-snb-2520m     total:289  pass:251  dwarn:0   dfail:0   fail:0   skip:38  time:589s
fi-snb-2600      total:289  pass:248  dwarn:0   dfail:0   fail:2   skip:39  time:427s

== Logs ==

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

#2 lore raw

✗ Fi.CI.IGT: warning for igt/kms_psr_sink_crc: Add psr_drrs subtest

In reply to Radhakrishna Sripada
== Series Details ==

== Series Details ==

Series: igt/kms_psr_sink_crc: Add psr_drrs subtest
URL : https://patchwork.freedesktop.org/series/30460/
State : warning

== Summary ==

Test perf:

        Subgroup blocking:
                fail       -> PASS       (shard-hsw) fdo#102252 +1
Test kms_cursor_crc:
        Subgroup cursor-64x64-dpms:
                pass       -> SKIP       (shard-hsw)
Test kms_setmode:
        Subgroup basic:
                fail       -> PASS       (shard-hsw) fdo#99912
Test drv_module_reload:
        Subgroup basic-no-display:
                pass       -> DMESG-WARN (shard-hsw)

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

shard-hsw total:2314 pass:1244 dwarn:1 dfail:0 fail:12 skip:1057 time:9470s

== Logs ==

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

Reviewed-by
#3 lore raw
In reply to Radhakrishna Sripada
Quoted 2 lines · Radhakrishna Sripada

Platforms do not support psr and drrs simultaneously. Adding a subtest to make the check.

I wasn't confident this was the right place for that, but this is definitely the easisest and cleanest way.

Quoted 4 lines
Quoted 43 lines
---
 tests/kms_psr_sink_crc.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
tests/kms_psr_sink_crc.c +14 -0
index bd3fa5e94d85..1c25f2c81a34 100644
@@ -284,6 +284,15 @@ static void assert_or_manual(bool condition, const char *expected)
 	igt_assert(igt_interactive_debug || condition);
 }
 
+static bool drrs_disabled(data_t *data)
+{
+	char buf[512];
+
+	igt_debugfs_read(data->drm_fd, "i915_drrs_status", buf);
+
+	return strstr(buf, "DRRS Support: No\n");
+}
+
 static void run_test(data_t *data)
 {
 	uint32_t handle = data->fb_white.gem_handle;
@@ -524,6 +533,11 @@ int main(int argc, char *argv[])
 		igt_assert(wait_psr_entry(&data));
 	}
 
+	igt_subtest("psr_drrs") {
+		setup_test_plane(&data);
+		igt_assert(drrs_disabled(&data));
+	}
+
 	for (op = PAGE_FLIP; op <= RENDER; op++) {
 		igt_subtest_f("primary_%s", op_str(op)) {
 			data.test_plane = DRM_PLANE_TYPE_PRIMARY;
Signature · 6 lines
2.9.3

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

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

Applied
#4 lore raw
Quoted 8 lines · Rodrigo Vivi
Quoted 2 lines · Radhakrishna Sripada

Platforms do not support psr and drrs simultaneously. Adding a subtest to make the check.

I wasn't confident this was the right place for that, but this is definitely the easisest and cleanest way.

Quoted 1 line
Quoted 5 lines
Quoted 3 lines

merged to master. thanks for the patch,.

Quoted 49 lines
Quoted 41 lines

---
 tests/kms_psr_sink_crc.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
tests/kms_psr_sink_crc.c +14 -1
index bd3fa5e94d85..1c25f2c81a34 100644
@@ -284,6 +284,15 @@ static void assert_or_manual(bool condition, const char *expected)
      igt_assert(igt_interactive_debug || condition);
 }
 
+static bool drrs_disabled(data_t *data)
+{
+     char buf[512];
+
+     igt_debugfs_read(data->drm_fd, "i915_drrs_status", buf);
+
+     return strstr(buf, "DRRS Support: No\n");
+}
+
 static void run_test(data_t *data)
 {
      uint32_t handle = data->fb_white.gem_handle;
@@ -524,6 +533,11 @@ int main(int argc, char *argv[])
              igt_assert(wait_psr_entry(&data));
      }
 
+     igt_subtest("psr_drrs") {
+             setup_test_plane(&data);
+             igt_assert(drrs_disabled(&data));
+     }
+
      for (op = PAGE_FLIP; op <= RENDER; op++) {
              igt_subtest_f("primary_%s", op_str(op)) {
                      data.test_plane = DRM_PLANE_TYPE_PRIMARY;
--

2.9.3

Quoted 4 lines

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

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

Signature · 6 lines
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw
Quoted 3 lines · Rodrigo Vivi
Quoted 1 line

merged to master. thanks for the patch,.

Obligatory scolding: You forgot to add your R-b to the commit message.

Signature · 5 lines
Petri Latvala
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw
Quoted 7 lines · Petri Latvala
Quoted 3 lines · Rodrigo Vivi
Quoted 1 line

merged to master. thanks for the patch,.

Obligatory scolding: You forgot to add your R-b to the commit message.

Duh! o>

I get I got used to dim tool and patchwork adding that for me... I assume that I also forgot to sign-off...

Sorry about that...

Quoted 4 lines
Signature · 2 lines
-- 
Petri Latvala

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

#7 lore raw
In reply to Radhakrishna Sripada
Quoted 15 lines · Radhakrishna Sripada

Platforms do not support psr and drrs simultaneously. Adding a subtest to make the check.

---
 tests/kms_psr_sink_crc.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
tests/kms_psr_sink_crc.c +0 -0
index bd3fa5e94d85..1c25f2c81a34 100644

tests/kms_psr_sink_crc.c static void assert_or_manual(bool condition, const char *expected) · line 293

Quoted 10 lines
tests/kms_psr_sink_crc.c +7 -0
@@ -284,6 +284,15 @@ static void assert_or_manual(bool condition, const char *expected)
 	igt_assert(igt_interactive_debug || condition);
 }
 
+static bool drrs_disabled(data_t *data)
+{
+	char buf[512];
+
+	igt_debugfs_read(data->drm_fd, "i915_drrs_status", buf);
+
+	return strstr(buf, "DRRS Support: No\n");
                                        ^ 

This is causing the PSR sink crc test to fail. The string I see in the kernel is.

	seq_puts(m, "\tDRRS Supported : No");

Also, how does this work when there is more than one enabled crtc? For e.g., my machine has

cat /sys/kernel/debug/dri/0/i915_drrs_status

CRTC 1: eDP-1:
VBT: DRRS_type: Static

DRRS Supported : No

CRTC 2: DP-4:
VBT: DRRS_type: Static

DRRS Supported : No

If the eDP supported DRRS( and PSR was enabled) and the external display did not, won't this result in a false positive?

Quoted 7 lines
tests/kms_psr_sink_crc.c +2 -0
+}
+
 static void run_test(data_t *data)
 {
 	uint32_t handle = data->fb_white.gem_handle;
@@ -524,6 +533,11 @@ int main(int argc, char *argv[])
 		igt_assert(wait_psr_entry(&data));

tests/kms_psr_sink_crc.c int main(int argc, char *argv[]) · line 543

Quoted 10 lines
tests/kms_psr_sink_crc.c +5 -0
 	}
 
+	igt_subtest("psr_drrs") {
+		setup_test_plane(&data);
+		igt_assert(drrs_disabled(&data));
+	}
+
 	for (op = PAGE_FLIP; op <= RENDER; op++) {
 		igt_subtest_f("primary_%s", op_str(op)) {
 			data.test_plane = DRM_PLANE_TYPE_PRIMARY;

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

#8 lore raw
Quoted 47 lines · Dhinakaran
Quoted 18 lines · Radhakrishna Sripada

Platforms do not support psr and drrs simultaneously. Adding a subtest to make the check.

---
tests/kms_psr_sink_crc.c | 14 ++++++++++++++

1 file changed, 14 insertions(+)
tests/kms_psr_sink_crc.c +0 -0
index bd3fa5e94d85..1c25f2c81a34 100644

tests/kms_psr_sink_crc.c static void assert_or_manual(bool condition, const char *expected) · line 293

Quoted 10 lines
tests/kms_psr_sink_crc.c +7 -0
@@ -284,6 +284,15 @@ static void assert_or_manual(bool condition, const char *expected)
   igt_assert(igt_interactive_debug || condition);
 }
 
+static bool drrs_disabled(data_t *data)
+{
+    char buf[512];
+
+    igt_debugfs_read(data->drm_fd, "i915_drrs_status", buf);
+
+    return strstr(buf, "DRRS Support: No\n");
                                       ^ 

This is causing the PSR sink crc test to fail. The string I see in the kernel is.

   seq_puts(m, "\tDRRS Supported : No");

Also, how does this work when there is more than one enabled crtc? For e.g., my machine has

cat /sys/kernel/debug/dri/0/i915_drrs_status

CRTC 1: eDP-1:
VBT: DRRS_type: Static

DRRS Supported : No

Quoted 7 lines

CRTC 2: DP-4:
VBT: DRRS_type: Static

DRRS Supported : No

If the eDP supported DRRS( and PSR was enabled) and the external display did not, won't this result in a false positive?

Yes... we need a quick fix on test case or to revert the test case while it cannot handle proper parse for edp's drrs...

Quoted 11 lines
Quoted 11 lines
tests/kms_psr_sink_crc.c +2 -0
+}
+
 static void run_test(data_t *data)
 {
   uint32_t handle = data->fb_white.gem_handle;
@@ -524,6 +533,11 @@ int main(int argc, char *argv[])
       igt_assert(wait_psr_entry(&data));
   }
 
Quoted 8 lines

tests/kms_psr_sink_crc.c int main(int argc, char *argv[]) · line 543

Quoted 8 lines
tests/kms_psr_sink_crc.c +5 -0
+    igt_subtest("psr_drrs") {
+        setup_test_plane(&data);
+        igt_assert(drrs_disabled(&data));
+    }
+
   for (op = PAGE_FLIP; op <= RENDER; op++) {
       igt_subtest_f("primary_%s", op_str(op)) {
           data.test_plane = DRM_PLANE_TYPE_PRIMARY;

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