[igt-dev] [PATCH i-g-t 2/3] tests/kms_plane_scaling: Allow clip test to fail with YUV

[Ville Syrjala <ville.syrjala@linux.intel.com>]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

YUV formats require the clipped src coordinates to be suitably aligned.
We'd need to very carefully compute the unclipped dst coordinates to
guarantee that. That's too much hassle so let's just accept failure in
case YUV formats are used.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 lib/igt_fb.c              | 20 ++++++++++++++++++++
 lib/igt_fb.h              |  1 +
 tests/kms_plane_scaling.c | 10 ++++++++++
 3 files changed, 31 insertions(+)

diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index 34b1a261b95c..9308ade0c50e 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -1706,3 +1706,23 @@ bool igt_fb_supported_format(uint32_t drm_format)
 
 	return false;
 }
+
+/**
+ * igt_format_is_yuv:
+ * @drm_format: drm fourcc
+ *
+ * This functions returns whether @drm_format is YUV (as opposed to RGB).
+ */
+bool igt_format_is_yuv(uint32_t drm_format)
+{
+	switch (drm_format) {
+	case DRM_FORMAT_NV12:
+	case DRM_FORMAT_YUYV:
+	case DRM_FORMAT_YVYU:
+	case DRM_FORMAT_UYVY:
+	case DRM_FORMAT_VYUY:
+		return true;
+	default:
+		return false;
+	}
+}
diff --git a/lib/igt_fb.h b/lib/igt_fb.h
index 023b069db592..081ed42a99c9 100644
--- a/lib/igt_fb.h
+++ b/lib/igt_fb.h
@@ -163,6 +163,7 @@ uint32_t igt_bpp_depth_to_drm_format(int bpp, int depth);
 uint32_t igt_drm_format_to_bpp(uint32_t drm_format);
 const char *igt_format_str(uint32_t drm_format);
 bool igt_fb_supported_format(uint32_t drm_format);
+bool igt_format_is_yuv(uint32_t drm_format);
 
 #endif /* __IGT_FB_H__ */
 
diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c
index a8454205dbd8..a12a3a0ade2b 100644
--- a/tests/kms_plane_scaling.c
+++ b/tests/kms_plane_scaling.c
@@ -408,6 +408,16 @@ __test_scaler_with_clipping_clamping_scenario(data_t *d, drmModeModeInfo *mode,
 	igt_plane_set_size(d->plane2, mode->hdisplay + 100,
 					    mode->vdisplay + 100);
 	igt_display_commit2(&d->display, COMMIT_ATOMIC);
+
+	/*
+	 * Can't guarantee that the clipped coordinates are
+	 * suitably aligned for yuv. So allow the commit to fail.
+	 */
+	if (igt_format_is_yuv(d->fb[1].drm_format) ||
+	    igt_format_is_yuv(d->fb[2].drm_format))
+		igt_display_try_commit2(&d->display, COMMIT_ATOMIC);
+	else
+		igt_display_commit2(&d->display, COMMIT_ATOMIC);
 }
 
 static void
-- 
2.16.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev