diff options
-rw-r--r-- | lib/igt_fb.c | 6 | ||||
-rw-r--r-- | lib/igt_kms.c | 1 | ||||
-rw-r--r-- | tests/kms_flip.c | 9 |
3 files changed, 9 insertions, 7 deletions
diff --git a/lib/igt_fb.c b/lib/igt_fb.c index ef486f97..29a12c6c 100644 --- a/lib/igt_fb.c +++ b/lib/igt_fb.c @@ -79,7 +79,7 @@ static int create_bo_for_fb(int fd, int width, int height, int bpp, unsigned *size_ret, unsigned *stride_ret) { uint32_t gem_handle; - int size; + int size, ret = 0; unsigned stride; if (tiled) { @@ -109,13 +109,13 @@ static int create_bo_for_fb(int fd, int width, int height, int bpp, gem_handle = gem_create(fd, size); if (tiled) - gem_set_tiling(fd, gem_handle, I915_TILING_X, stride); + ret = __gem_set_tiling(fd, gem_handle, I915_TILING_X, stride); *stride_ret = stride; *size_ret = size; *gem_handle_ret = gem_handle; - return 0; + return ret; } /** diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 9dee855c..fffad9f6 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -56,7 +56,6 @@ * Note that this library's header pulls in the [i-g-t framebuffer](intel-gpu-tools-i-g-t-framebuffer.html) * library as a dependency. */ - const char *kmstest_pipe_str(int pipe) { const char *str[] = { "A", "B", "C" }; diff --git a/tests/kms_flip.c b/tests/kms_flip.c index 24bbc0ba..c2f0d2ee 100644 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -1277,11 +1277,13 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs, true, &o->fb_info[2]); igt_assert(o->fb_ids[0]); igt_assert(o->fb_ids[1]); - igt_assert(o->fb_ids[2]); + if (o->flags & TEST_FB_BAD_TILING) + igt_require(o->fb_ids[2]); paint_flip_mode(&o->fb_info[0], false); paint_flip_mode(&o->fb_info[1], true); - paint_flip_mode(&o->fb_info[2], true); + if (o->fb_ids[2]) + paint_flip_mode(&o->fb_info[2], true); if (o->flags & TEST_FB_BAD_TILING) set_y_tiling(o, 2); @@ -1329,7 +1331,8 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs, igt_info("\n%s: PASSED\n\n", test_name); out: - igt_remove_fb(drm_fd, &o->fb_info[2]); + if (o->fb_ids[2]) + igt_remove_fb(drm_fd, &o->fb_info[2]); igt_remove_fb(drm_fd, &o->fb_info[1]); igt_remove_fb(drm_fd, &o->fb_info[0]); |