diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-10-09 20:50:50 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-10-09 20:50:50 +0200 |
| commit | 590f6101402b51bca54f69c002380bda967484ea (patch) | |
| tree | 9ae3e85c2405fe316e76a608ddb55cfcaf5ea4e1 /demos | |
| parent | 40599b077972e1a721fdfcc93455e60b5b564a13 (diff) | |
lib/drmtest: extract rawer __gem_set_tiling
For tests that expect failures. Also apply the existing gem_set_tiling
helper a bit wider.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/intel_sprite_on.c | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/demos/intel_sprite_on.c b/demos/intel_sprite_on.c index 5c380c19..e1b4fd55 100644 --- a/demos/intel_sprite_on.c +++ b/demos/intel_sprite_on.c @@ -320,7 +320,6 @@ static int prepare_primary_surface(int fd, int prim_width, int prim_height, { uint32_t bytes_per_pixel = sizeof(uint32_t); uint32_t *prim_fb_ptr; - struct drm_i915_gem_set_tiling set_tiling; if (bytes_per_pixel != sizeof(uint32_t)) { printf("Bad bytes_per_pixel for primary surface: %d\n", @@ -354,16 +353,8 @@ static int prepare_primary_surface(int fd, int prim_width, int prim_height, *prim_handle = gem_create(fd, *prim_size); - if (tiled) { - set_tiling.handle = *prim_handle; - set_tiling.tiling_mode = I915_TILING_X; - set_tiling.stride = *prim_stride; - if (ioctl(fd, DRM_IOCTL_I915_GEM_SET_TILING, &set_tiling)) { - printf("Set tiling failed: %s (stride=%d, size=%d)\n", - strerror(errno), *prim_stride, *prim_size); - return -1; - } - } + if (tiled) + gem_set_tiling(fd, *prim_handle, I915_TILING_X, *prim_stride); prim_fb_ptr = gem_mmap(fd, *prim_handle, *prim_size, PROT_READ | PROT_WRITE); @@ -421,7 +412,6 @@ static int prepare_sprite_surfaces(int fd, int sprite_width, int sprite_height, { uint32_t bytes_per_pixel = sizeof(uint32_t); uint32_t *sprite_fb_ptr; - struct drm_i915_gem_set_tiling set_tiling; int i; if (bytes_per_pixel != sizeof(uint32_t)) { @@ -457,16 +447,8 @@ static int prepare_sprite_surfaces(int fd, int sprite_width, int sprite_height, // Create the sprite surface sprite_handles[i] = gem_create(fd, *sprite_size); - if (tiled) { - set_tiling.handle = sprite_handles[i]; - set_tiling.tiling_mode = I915_TILING_X; - set_tiling.stride = *sprite_stride; - if (ioctl(fd, DRM_IOCTL_I915_GEM_SET_TILING, &set_tiling)) { - printf("Set tiling failed: %s (stride=%d, size=%d)\n", - strerror(errno), *sprite_stride, *sprite_size); - return -1; - } - } + if (tiled) + gem_set_tiling(fd, sprite_handles[i], I915_TILING_X, *sprite_stride); // Get pointer to the surface sprite_fb_ptr = gem_mmap(fd, |