Re: [igt-dev] [PATCH i-g-t v3 02/21] lib/igt_fb: Add checks on i915 for i915-specific tiled buffer allocation

Lyude Paul
2019-01-15T00:39:55Z

Reviewed-by: Lyude Paul <lyude@redhat.com>

On Fri, 2019-01-11 at 10:05 +0100, Paul Kocialkowski wrote:
> 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>
> ---
> lib/igt_fb.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/lib/igt_fb.c b/lib/igt_fb.c
> index 9ceeb824fff4..9ecd10b8cde1 100644
> --- a/lib/igt_fb.c
> +++ b/lib/igt_fb.c
> @@ -364,6 +364,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;
>
> @@ -392,6 +393,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];
> @@ -1488,9 +1490,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;
> }
--
Cheers,
Lyude Paul