tests/kms_fbc_crc: Check context support earlier
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 8 May 2014 12:56:24 +0000 (15:56 +0300)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 9 May 2014 18:03:46 +0000 (21:03 +0300)
Check for context support before doing anything else in the subtest.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
tests/kms_fbc_crc.c

index b728224..4013510 100644 (file)
@@ -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];