diff options
| author | Paul Kocialkowski <paul.kocialkowski@bootlin.com> | 2018-12-05 11:14:37 +0100 |
|---|---|---|
| committer | Paul Kocialkowski <paul.kocialkowski@bootlin.com> | 2019-02-26 09:45:54 +0100 |
| commit | e1092cb8a1f6f0b92bb5867e2c87e141c13b8178 (patch) | |
| tree | da7d5fae6ffc0104bb1ab1a1a25f8e21514cb79f /lib/igt_fb.c | |
| parent | caa9bb3a131ed8bcef7eae1d153ece6c20bc116c (diff) | |
lib/igt_fb: Add checks on i915 for i915-specific tiled buffer allocation
The code path for allocating tiled buffers has a few i915-specific bits
without checks for the i915 driver. Add these missing checks.
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Reviewed-by: Maxime Ripard <maxime.ripard@bootlin.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Diffstat (limited to 'lib/igt_fb.c')
| -rw-r--r-- | lib/igt_fb.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/igt_fb.c b/lib/igt_fb.c index 462afec2..058cfab6 100644 --- a/lib/igt_fb.c +++ b/lib/igt_fb.c @@ -397,6 +397,7 @@ static uint32_t calc_plane_stride(struct igt_fb *fb, int plane) (fb->plane_bpp[plane] / 8); if (fb->tiling != LOCAL_DRM_FORMAT_MOD_NONE && + is_i915_device(fb->fd) && intel_gen(intel_get_drm_devid(fb->fd)) <= 3) { uint32_t stride; @@ -425,6 +426,7 @@ static uint32_t calc_plane_stride(struct igt_fb *fb, int plane) static uint64_t calc_plane_size(struct igt_fb *fb, int plane) { if (fb->tiling != LOCAL_DRM_FORMAT_MOD_NONE && + is_i915_device(fb->fd) && intel_gen(intel_get_drm_devid(fb->fd)) <= 3) { uint64_t min_size = (uint64_t) fb->strides[plane] * fb->plane_height[plane]; @@ -1559,9 +1561,11 @@ static void *map_bo(int fd, struct igt_fb *fb) if (fb->is_dumb) ptr = kmstest_dumb_map_buffer(fd, fb->gem_handle, fb->size, PROT_READ | PROT_WRITE); - else + else if (is_i915_device(fd)) ptr = gem_mmap__gtt(fd, fb->gem_handle, fb->size, PROT_READ | PROT_WRITE); + else + igt_assert(false); return ptr; } |