From d6353c5761b8a28fee7f83740d052287d6634068 Mon Sep 17 00:00:00 2001 From: Petri Latvala Date: Thu, 5 Jan 2017 11:03:46 -0200 Subject: kms_frontbuffer_tracking: fix sink CRC detection regression Don't forget to mark the CRC as not supported if there are no eDP panels. Regression introduced by: commit 8aa7ea4f84b0e1384b78f4cc9b136ea5b641055a Author: Paulo Zanoni kms_frontbuffer_tracking: refactor sink CRC reliability handling v2 (from Paulo): - Convert Petri's email patch to an actual git patch - Add an extra assertion, just in case - Add Petri's s-o-b tag (authorized via IRC) Signed-off-by: Petri Latvala Signed-off-by: Paulo Zanoni --- tests/kms_frontbuffer_tracking.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c index b91f08b0..a23dcca1 100644 --- a/tests/kms_frontbuffer_tracking.c +++ b/tests/kms_frontbuffer_tracking.c @@ -943,6 +943,7 @@ static void get_sink_crc(sink_crc_t *crc, bool mandatory) if (mandatory) igt_skip("Sink CRC is unreliable on this machine.\n"); } else { + igt_assert_f(rc != -1, "Unexpected error: %d\n", errno_); igt_assert(rc == SINK_CRC_SIZE); } } @@ -1399,6 +1400,7 @@ static void setup_sink_crc(void) c = get_connector(prim_mode_params.connector_id); if (c->connector_type != DRM_MODE_CONNECTOR_eDP) { igt_info("Sink CRC not supported: primary screen is not eDP\n"); + sink_crc.supported = false; return; } -- cgit v1.2.3