Skip to contentSkip to conversation

Add FBC support to PSR/PSR2 tests

PATCH New Jeevan B 2 participants 4 messages Nov 24, 2023 Library code

lore
Share & tools
lore

Jeevan B

author
#0 lore raw

cover Add FBC support to PSR/PSR2 tests

Jeevan B (2):
tests/intel/kms_psr: Add FBC support to PSR/PSR2 tests tests/intel/kms_psr2_sf: Add FBC support to PSR2 tests

 lib/igt_psr.h             |   5 +
 tests/intel/kms_psr.c     | 240 +++++++++-------
 tests/intel/kms_psr2_sf.c | 567 ++++++++++++++++++++------------------
 3 files changed, 438 insertions(+), 374 deletions(-)
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 1/2 tests/intel/kms_psr: Add FBC support to PSR/PSR2 tests

For intel_display_ver 20, FBC can be enabled along with PSR/PSR2, thereby adding FBC checks to validate this scenario.

---
 lib/igt_psr.h         |   5 +
 tests/intel/kms_psr.c | 240 ++++++++++++++++++++++++------------------
 2 files changed, 142 insertions(+), 103 deletions(-)
lib/igt_psr.h +5 -0
index a30330e6c..fee9df6b3 100644
@@ -40,6 +40,11 @@ enum psr_mode {
 	PSR_DISABLED,
 };
 
+enum fbc_mode {
+	FBC_ENABLED,
+	FBC_DISABLED,
+};
+
 bool psr_disabled_check(int debugfs_fd);
 bool psr2_selective_fetch_check(int debugfs_fd);
 bool psr_wait_entry(int debugfs_fd, enum psr_mode mode, igt_output_t *output);
tests/intel/kms_psr.c +137 -103

329 lines not on this page · raw message

Signature · 1 line
2.25.1
author
#2 lore raw

PATCH 2/2 tests/intel/kms_psr2_sf: Add FBC support to PSR2 tests

In reply to Jeevan B

For intel_display_ver 20, FBC can be enabled along with PSR2, thereby adding FBC checks to validate this scenario.

---
 tests/intel/kms_psr.c     |   4 +-
 tests/intel/kms_psr2_sf.c | 567 ++++++++++++++++++++------------------
 2 files changed, 298 insertions(+), 273 deletions(-)
tests/intel/kms_psr.c +2 -2
index c1d987415..95cb9164f 100644
@@ -840,7 +840,7 @@ igt_main
 		"fbc_"
 	};
 	int modes[] = {PSR_MODE_1, PSR_MODE_2, PR_MODE};
-	int fbc_status[] = {FBC_ENABLED, FBC_DISABLED};
+	int fbc_status[] = {FBC_DISABLED, FBC_ENABLED};
 	igt_output_t *output;
 
 	igt_fixture {
@@ -860,7 +860,7 @@ igt_main
 	for (y = 0; y < ARRAY_SIZE(fbc_status); y++) {
 
 		data.op_fbc_mode = fbc_status[y];
-		if (data.op_fbc_mode == FBC_ENABLED)
+		if (data.op_fbc_mode == FBC_DISABLED)
 			data.fbc_flag = false;
 
 		for (z = 0; z < ARRAY_SIZE(modes); z++) {
tests/intel/kms_psr2_sf.c +296 -271

685 lines not on this page · raw message

Signature · 1 line
2.25.1
#3 lore raw

[igt-dev] ✗ Fi.CI.BUILD: failure for Add FBC support to PSR/PSR2 tests (rev4)

In reply to Jeevan B
== Series Details ==

== Series Details ==

Series: Add FBC support to PSR/PSR2 tests (rev4)
URL : https://patchwork.freedesktop.org/series/126689/
State : failure

== Summary ==

Applying: tests/intel/kms_psr: Add FBC support to PSR/PSR2 tests Using index info to reconstruct a base tree...
M tests/intel/kms_psr.c
Falling back to patching base and 3-way merge...
Auto-merging tests/intel/kms_psr.c
CONFLICT (content): Merge conflict in tests/intel/kms_psr.c Patch failed at 0001 tests/intel/kms_psr: Add FBC support to PSR/PSR2 tests When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".