summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetri Latvala <petri.latvala@intel.com>2017-01-05 11:03:46 -0200
committerPaulo Zanoni <paulo.r.zanoni@intel.com>2017-01-05 14:42:32 -0200
commitd6353c5761b8a28fee7f83740d052287d6634068 (patch)
tree7c854e5412d874d9531cd5f954fa4dbc3f051fd2
parentaeb4e1341b778e75ef0511087a9c4ad7ab1ff114 (diff)
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 <paulo.r.zanoni@intel.com> 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 <petri.latvala@intel.com> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
-rw-r--r--tests/kms_frontbuffer_tracking.c2
1 files changed, 2 insertions, 0 deletions
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;
}