[PATCH i-g-t v3 11/11] tests/intel/kms_fbcon_fbt: use common routine to skip tests on fbc status

[Vinod Govindapillai <vinod.govindapillai@intel.com>]

Use the common intel_fbc_found_skip_reason() defined as part of the fbc
library functions to check and assess the fbc skip reasons. The "no fbc
reasons" are appended based on the reasons defined in the kms_fbcon_fbt
tests.

Signed-off-by: Vinod Govindapillai <vinod.govindapillai@intel.com>
---
 lib/i915/intel_fbc.c        |  7 +++++++
 tests/intel/kms_fbcon_fbt.c | 26 ++------------------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/lib/i915/intel_fbc.c b/lib/i915/intel_fbc.c
index fde9ef03b..30584925f 100644
--- a/lib/i915/intel_fbc.c
+++ b/lib/i915/intel_fbc.c
@@ -77,10 +77,17 @@ bool intel_fbc_found_skip_reason(int device, int crtc_index)
 {
 	const char *const no_fbc_reasons[] = {
 		"FBC disabled: not enough stolen memory",
+		"FBC disabled: pixel format not supported",
+		"FBC disabled: tiling not supported",
+		"FBC disabled: rotation not supported",
 		"FBC disabled: stride not supported",
+		"FBC disabled: per-pixel alpha not supported",
 		"FBC disabled: plane size too big",
 		"FBC disabled: surface size too big",
 		"FBC disabled: PSR1 enabled (Wa_14016291713)"
+		"FBC disabled: plane start Y offset misaligned",
+		"FBC disabled: plane end Y offset misaligned",
+		"FBC disabled: pixel rate too high"
 	};
 	bool found_reason = false;
 	char fbc_status[FBC_STATUS_BUF_LEN];
diff --git a/tests/intel/kms_fbcon_fbt.c b/tests/intel/kms_fbcon_fbt.c
index f738e243f..470027a84 100644
--- a/tests/intel/kms_fbcon_fbt.c
+++ b/tests/intel/kms_fbcon_fbt.c
@@ -297,30 +297,8 @@ static inline void psr_debugfs_enable(struct drm_info *drm)
 
 static void fbc_skips_on_fbcon(struct drm_info *drm)
 {
-	const char *reasons[] = {
-		"pixel format not supported",
-		"tiling not supported",
-		"rotation not supported",
-		"stride not supported",
-		"per-pixel alpha not supported",
-		"plane size too big",
-		"surface size too big",
-		"plane start Y offset misaligned",
-		"plane end Y offset misaligned",
-		"pixel rate too high"
-	};
-	bool skip = false;
-	char buf[FBC_STATUS_BUF_LEN];
-	int i;
-
-	igt_debugfs_simple_read(drm->debugfs_fd, "i915_fbc_status", buf, sizeof(buf));
-	if (strstr(buf, "FBC enabled\n"))
-		return;
-
-	for (i = 0; skip == false && i < ARRAY_SIZE(reasons); i++)
-		skip = strstr(buf, reasons[i]);
-
-	igt_skip_on_f(skip, "fbcon modeset is not compatible with FBC\n");
+	igt_skip_on_f(intel_fbc_found_skip_reason(drm->fd, drm->crtc_index),
+		      "fbcon modeset is not compatible with FBC\n");
 }
 
 static void psr_skips_on_fbcon(struct drm_info *drm)
-- 
2.43.0