From d848a36545eec43760de7e34a57a796182358087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Thu, 8 May 2014 15:56:24 +0300 Subject: [PATCH] tests/kms_fbc_crc: Check context support earlier MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Check for context support before doing anything else in the subtest. Signed-off-by: Ville Syrjälä --- tests/kms_fbc_crc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/kms_fbc_crc.c b/tests/kms_fbc_crc.c index b728224c..4013510e 100644 --- a/tests/kms_fbc_crc.c +++ b/tests/kms_fbc_crc.c @@ -401,9 +401,9 @@ static bool prepare_test(data_t *data, enum test_mode mode) if (mode == TEST_CONTEXT || mode == TEST_PAGE_FLIP_AND_CONTEXT) { data->ctx[0] = drm_intel_gem_context_create(data->bufmgr); - igt_require(data->ctx[0]); + igt_assert(data->ctx[0]); data->ctx[1] = drm_intel_gem_context_create(data->bufmgr); - igt_require(data->ctx[1]); + igt_assert(data->ctx[1]); /* * Disable FBC RT address for both contexts @@ -460,6 +460,12 @@ static void run_test(data_t *data, enum test_mode mode) int i, n; int valid_tests = 0; + if (mode == TEST_CONTEXT || mode == TEST_PAGE_FLIP_AND_CONTEXT) { + drm_intel_context *ctx = drm_intel_gem_context_create(data->bufmgr); + igt_require(ctx); + drm_intel_gem_context_destroy(ctx); + } + for (i = 0; i < data->resources->count_connectors; i++) { uint32_t connector_id = data->resources->connectors[i];