Re: [igt-dev] [PATCH i-g-t v2 05/12] lib/igt_fb: Add checks on i915 for i915-specific tiled buffer allocation

Maxime Ripard
2018-12-14T09:02:50Z

[-- Attachment #1.1: Type: text/plain, Size: 2068 bytes --]

On Thu, Dec 13, 2018 at 04:55:26PM +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 | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/lib/igt_fb.c b/lib/igt_fb.c
> index e314916884d7..73e5c654b8f6 100644
> --- a/lib/igt_fb.c
> +++ b/lib/igt_fb.c
> @@ -298,6 +298,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;
>
> @@ -326,6 +327,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];
> @@ -1466,7 +1468,7 @@ static void destroy_cairo_surface__gtt(void *arg)
>
> static void *map_bo(int fd, struct igt_fb *fb)
> {
> - void *ptr;
> + void *ptr = NULL;
>
> if (is_i915_device(fd))
> gem_set_domain(fd, fb->gem_handle,
> @@ -1475,9 +1477,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;

You're not using that variable unless it has been assigned, so you
shouldn't need to set it to NULL. Did gcc put a warning?

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

[-- Attachment #2: Type: text/plain, Size: 154 bytes --]