[Mesa-dev] [PATCH 4/5] gbm: Export a per plane getter for stride

[Jason Ekstrand]

On Mon, Mar 6, 2017 at 6:37 PM, Ben Widawsky <ben at bwidawsk.net> wrote:

> v2: Preserve legacy behavior when plane is 0 (Jason Ekstrand)
> EINVAL when input plane is greater than total planes (Jason Ekstrand)
> Don't leak the image after fromPlanar (Daniel)
> Move bo->image check below plane count preventing bad index succeeding
> (Daniel)
>
> v3: Fix DRIimage leak (using Jason's recommended change)
> Make plane 0 return planar stride. This might break legacy behavior (Jason)
>
> Cc: Jason Ekstrand <jason at jlekstrand.net>
> Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
> Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com> (v1)
> Acked-by: Daniel Stone <daniels at collabora.com>
> ---
>  src/gbm/backends/dri/gbm_dri.c | 45 ++++++++++++++++++++++++++++++
> ++++++------
>  src/gbm/gbm-symbols-check      |  1 +
>  src/gbm/main/gbm.c             | 15 +++++++++++++-
>  src/gbm/main/gbm.h             |  3 +++
>  4 files changed, 57 insertions(+), 7 deletions(-)
>
> diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_
> dri.c
> index 3d9c540d95..ecba3ead5a 100644
> --- a/src/gbm/backends/dri/gbm_dri.c
> +++ b/src/gbm/backends/dri/gbm_dri.c
> @@ -648,20 +648,53 @@ gbm_dri_bo_get_handle_for_plane(struct gbm_bo *_bo,
> int plane)
>     }
>
>     __DRIimage *image = dri->image->fromPlanar(bo->image, plane, NULL);
> -   if (!image) {
> -      /* Use the parent's handle */
> -      image = bo->image;
> +   if (image) {
> +      dri->image->queryImage(image, __DRI_IMAGE_ATTRIB_HANDLE, &ret.s32);
> +      dri->image->destroyImage(image);
> +   } else {
> +      dri->image->queryImage(bo->image, __DRI_IMAGE_ATTRIB_HANDLE,
> &ret.s32);
>     }
>
> -   dri->image->queryImage(image, __DRI_IMAGE_ATTRIB_HANDLE, &ret.s32);
> -
>

Should this hunk go in the previous patch?


>     return ret;
>  }
>
>  static uint32_t
>  gbm_dri_bo_get_stride(struct gbm_bo *_bo, int plane)
>  {
> -   return _bo->stride;
> +   struct gbm_dri_device *dri = gbm_dri_device(_bo->gbm);
> +   struct gbm_dri_bo *bo = gbm_dri_bo(_bo);
> +   __DRIimage *image;
> +   int stride = 0;
> +
> +   if (!dri->image || dri->image->base.version < 11 ||
> !dri->image->fromPlanar) {
> +      /* Preserve legacy behavior if plane is 0 */
> +      if (plane == 0)
> +         return _bo->stride;
> +
> +      errno = ENOSYS;
> +      return 0;
> +   }
> +
> +   if (plane >= get_number_planes(dri, bo->image)) {
> +      errno = EINVAL;
> +      return 0;
> +   }
> +
> +   if (bo->image == NULL)
> +      return _bo->stride;
>

Is this possible?


> +
> +   image = dri->image->fromPlanar(bo->image, plane, NULL);
> +   if (!image) {
> +      /* Use the parent stride */
> +      image = bo->image;
> +   }
> +
> +   dri->image->queryImage(image, __DRI_IMAGE_ATTRIB_STRIDE, &stride);
> +
> +   if (image != bo->image)
> +      dri->image->destroyImage(image);
>

Let's make the same tweaks to this clean-up path if you don't mind.


> +
> +   return (uint32_t)stride;
>  }
>
>  static void
> diff --git a/src/gbm/gbm-symbols-check b/src/gbm/gbm-symbols-check
> index 1e6dd4d3ec..459006a63f 100755
> --- a/src/gbm/gbm-symbols-check
> +++ b/src/gbm/gbm-symbols-check
> @@ -14,6 +14,7 @@ gbm_bo_unmap
>  gbm_bo_get_width
>  gbm_bo_get_height
>  gbm_bo_get_stride
> +gbm_bo_get_stride_for_plane
>  gbm_bo_get_format
>  gbm_bo_get_device
>  gbm_bo_get_handle
> diff --git a/src/gbm/main/gbm.c b/src/gbm/main/gbm.c
> index 7462e90c4c..0a9f0bef7e 100644
> --- a/src/gbm/main/gbm.c
> +++ b/src/gbm/main/gbm.c
> @@ -165,7 +165,20 @@ gbm_bo_get_height(struct gbm_bo *bo)
>  GBM_EXPORT uint32_t
>  gbm_bo_get_stride(struct gbm_bo *bo)
>  {
> -   return bo->gbm->bo_get_stride(bo, 0);
> +   return gbm_bo_get_stride_for_plane(bo, 0);
> +}
> +
> +/** Get the stride for the given plane
> + *
> + * \param bo The buffer object
> + * \param plane for which you want the stride
> + *
> + * \sa gbm_bo_get_stride()
> + */
> +GBM_EXPORT uint32_t
> +gbm_bo_get_stride_for_plane(struct gbm_bo *bo, int plane)
> +{
> +   return bo->gbm->bo_get_stride(bo, plane);
>  }
>
>  /** Get the format of the buffer object
> diff --git a/src/gbm/main/gbm.h b/src/gbm/main/gbm.h
> index 67548206c4..1719c5312a 100644
> --- a/src/gbm/main/gbm.h
> +++ b/src/gbm/main/gbm.h
> @@ -304,6 +304,9 @@ uint32_t
>  gbm_bo_get_stride(struct gbm_bo *bo);
>
>  uint32_t
> +gbm_bo_get_stride_for_plane(struct gbm_bo *bo, int plane);
> +
> +uint32_t
>  gbm_bo_get_format(struct gbm_bo *bo);
>
>  struct gbm_device *
> --
> 2.12.0
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20170307/b67702a6/attachment.html>