diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2016-02-24 10:39:47 +0100 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2016-04-14 13:54:24 +0100 |
| commit | c94a828f151686faab5bfa2fe0955cd440cead16 (patch) | |
| tree | 42304b52c04288f6af10a9f98aca849d3f0d40b4 /tests/kms_addfb_basic.c | |
| parent | decbf5a3b11878b93caaddda7c738b866939c1e2 (diff) | |
kms_addfb_basic: move tiling functionality into each subtest
Because calls to gem_set_tiling will cause the subtest to be skipped on
drivers other than i915, move them to each subtest that needs them so
the other subtests aren't skipped as well.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tests/kms_addfb_basic.c')
| -rw-r--r-- | tests/kms_addfb_basic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c index 1cf09767..648f98c1 100644 --- a/tests/kms_addfb_basic.c +++ b/tests/kms_addfb_basic.c @@ -156,17 +156,17 @@ static void pitch_tests(int fd) } } - igt_fixture - gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4); f.pitches[0] = 1024*4; igt_subtest("basic-X-tiled") { + gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4); igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == 0); igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); f.fb_id = 0; } igt_subtest("framebuffer-vs-set-tiling") { + gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4); igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == 0); igt_assert(__gem_set_tiling(fd, gem_bo, I915_TILING_X, 512*4) == -EBUSY); igt_assert(__gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4) == -EBUSY); @@ -176,14 +176,14 @@ static void pitch_tests(int fd) f.pitches[0] = 512*4; igt_subtest("tile-pitch-mismatch") { + gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4); igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && errno == EINVAL); } - igt_fixture - gem_set_tiling(fd, gem_bo, I915_TILING_Y, 1024*4); f.pitches[0] = 1024*4; igt_subtest("basic-Y-tiled") { + gem_set_tiling(fd, gem_bo, I915_TILING_Y, 1024*4); igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && errno == EINVAL); } |