[PATCH i-g-t v8 5/9] tests/kms_writeback: Refactor format handling in commit_and_dump_fb

[Sowmiya S <sowmiya.s@intel.com>]

Modify commit_and_dump_fb to select supported
formats if provided; Apply default format based
on the platform when none are specified.

v4: Add get format function to assign format
    based on vendor type as a default format. (Suraj)
v5: Change function name more descriptive (Suraj)
v6: Revise function name (Suraj)
    Refactor get format function based on BPC

Signed-off-by: Sowmiya S <sowmiya.s@intel.com>
Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
---
 tests/kms_writeback.c | 59 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 6 deletions(-)

diff --git a/tests/kms_writeback.c b/tests/kms_writeback.c
index defe43686..63917bf4f 100644
--- a/tests/kms_writeback.c
+++ b/tests/kms_writeback.c
@@ -101,6 +101,26 @@ const uint32_t fourcc[] = {
 	DRM_FORMAT_XBGR2101010,
 };
 
+enum bits_per_channel {
+	BPC_8 = 8,
+	BPC_10 = 10,
+};
+
+static uint32_t get_default_fb_format(igt_display_t *display, enum bits_per_channel bpc)
+{
+	/* Fail loudly if the enum is out of range */
+	igt_assert(bpc == BPC_8 || bpc == BPC_10);
+
+	if (bpc == BPC_8)
+		return is_intel_device(display->drm_fd) ?
+			DRM_FORMAT_XBGR8888 : DRM_FORMAT_XRGB8888;
+
+	if (bpc == BPC_10)
+		return is_intel_device(display->drm_fd) ?
+			DRM_FORMAT_XBGR2101010 : DRM_FORMAT_XRGB2101010;
+	return -1;
+}
+
 static bool check_writeback_config(igt_display_t *display, igt_output_t *output,
 				    drmModeModeInfo override_mode)
 {
@@ -447,7 +467,7 @@ static void do_single_commit(igt_output_t *output, igt_plane_t *plane, igt_fb_t
 }
 
 static void commit_and_dump_fb(igt_display_t *display, igt_output_t *output, igt_plane_t *plane,
-			        igt_fb_t *input_fb, drmModeModeInfo *mode)
+				igt_fb_t *input_fb, drmModeModeInfo *mode)
 {
 	cairo_surface_t *fb_surface_out;
 	char filepath_out[PATH_MAX];
@@ -456,12 +476,37 @@ static void commit_and_dump_fb(igt_display_t *display, igt_output_t *output, igt
 	char *file_name;
 	unsigned int fb_id;
 	igt_fb_t output_fb;
+	uint32_t format;
 
 	path_name = getenv("IGT_FRAME_DUMP_PATH");
 	file_name = getenv("FRAME_PNG_FILE_NAME");
 
+	if (!data.wb_fmt) {
+		format = get_default_fb_format(display, BPC_8);
+	} else {
+		drmModePropertyBlobRes *formats_blob;
+
+		formats_blob = igt_get_writeback_formats_blob(output);
+		igt_assert_f(formats_blob, "No writeback pixel formats\n");
+		igt_assert(!(formats_blob->length % 4));
+		for (int i = 0; i < formats_blob->length; i++) {
+			format = ((uint32_t *)formats_blob->data)[i];
+			// Skip zero or unknown formats
+			if (format == 0 || strcmp(igt_format_str(format), "invalid") == 0) {
+				format = 0;
+				continue;
+			}
+			igt_debug("Supported writeback format: %s\n", igt_format_str(format));
+			if (format == data.format)
+				break;
+			format = 0;
+		}
+		drmModeFreePropertyBlob(formats_blob);
+	}
+	igt_assert_f(format, "Given format not supported\n");
+
 	fb_id = igt_create_fb(display->drm_fd, mode->hdisplay, mode->vdisplay,
-			      data.wb_fmt ? data.format : DRM_FORMAT_XRGB8888,
+			      format,
 			      igt_fb_mod_to_tiling(0), &output_fb);
 	igt_require(fb_id > 0);
 
@@ -584,15 +629,16 @@ int igt_main_args("b:c:f:dl", long_options, help_str, opt_handler, NULL)
 
 		fb_id = igt_create_fb(display.drm_fd, mode.hdisplay,
 				      mode.vdisplay,
-				      DRM_FORMAT_XRGB8888,
+				      get_default_fb_format(&display, BPC_8),
 				      DRM_FORMAT_MOD_LINEAR,
 				      &input_fb);
 		igt_assert(fb_id >= 0);
 
-		if (data.supported_colors & XRGB2101010) {
+		if (data.supported_colors & XRGB2101010 ||
+		    data.supported_colors & XBGR2101010) {
 			fb_id = igt_create_fb(display.drm_fd, mode.hdisplay,
 					      mode.vdisplay,
-					      DRM_FORMAT_XRGB2101010,
+					      get_default_fb_format(&display, BPC_10),
 					      DRM_FORMAT_MOD_LINEAR,
 					      &input_fb_10bit);
 			igt_assert(fb_id >= 0);
@@ -725,7 +771,8 @@ int igt_main_args("b:c:f:dl", long_options, help_str, opt_handler, NULL)
 		cleanup_writeback(&display, output);
 		igt_remove_fb(display.drm_fd, &input_fb);
 
-		if (data.supported_colors & XRGB2101010)
+		if (data.supported_colors & XRGB2101010 ||
+		    data.supported_colors & XBGR2101010)
 			igt_remove_fb(display.drm_fd, &input_fb_10bit);
 
 		igt_display_fini(&display);
-- 
2.43.0