[PATCH 3/4] modesetting: Export two functions I want to reuse from DRI2/Present.

[Alex Deucher]

On Fri, Oct 10, 2014 at 5:09 AM, Eric Anholt <eric at anholt.net> wrote:
> This renames dumb_get_bo_from_handle(), since it wasn't using a handle
> (GEM terminology) but a dmabuf fd.
>
> Signed-off-by: Eric Anholt <eric at anholt.net>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  hw/xfree86/drivers/modesetting/drmmode_display.c | 8 ++++----
>  hw/xfree86/drivers/modesetting/drmmode_display.h | 3 +++
>  2 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
> index d959837..d8d1b44 100644
> --- a/hw/xfree86/drivers/modesetting/drmmode_display.c
> +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
> @@ -116,7 +116,7 @@ dumb_bo_unmap(int fd, struct dumb_bo *bo)
>  }
>  #endif
>
> -static int
> +int
>  dumb_bo_destroy(int fd, struct dumb_bo *bo)
>  {
>      struct drm_mode_destroy_dumb arg;
> @@ -137,8 +137,8 @@ dumb_bo_destroy(int fd, struct dumb_bo *bo)
>      return 0;
>  }
>
> -static struct dumb_bo *
> -dumb_get_bo_from_handle(int fd, int handle, int pitch, int size)
> +struct dumb_bo *
> +dumb_get_bo_from_fd(int fd, int handle, int pitch, int size)
>  {
>      struct dumb_bo *bo;
>      int ret;
> @@ -164,7 +164,7 @@ drmmode_SetSlaveBO(PixmapPtr ppix,
>      msPixmapPrivPtr ppriv = msGetPixmapPriv(drmmode, ppix);
>
>      ppriv->backing_bo =
> -        dumb_get_bo_from_handle(drmmode->fd, fd_handle, pitch, size);
> +        dumb_get_bo_from_fd(drmmode->fd, fd_handle, pitch, size);
>      if (!ppriv->backing_bo)
>          return FALSE;
>
> diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.h b/hw/xfree86/drivers/modesetting/drmmode_display.h
> index 438743b..c7e7ef0 100644
> --- a/hw/xfree86/drivers/modesetting/drmmode_display.h
> +++ b/hw/xfree86/drivers/modesetting/drmmode_display.h
> @@ -121,6 +121,9 @@ Bool drmmode_map_cursor_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
>  void drmmode_free_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
>  void drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmmode,
>                               int *depth, int *bpp);
> +struct dumb_bo *dumb_get_bo_from_fd(int drm_fd, int fd, int pitch, int size);
> +int dumb_bo_destroy(int fd, struct dumb_bo *bo);
> +
>
>  #ifndef DRM_CAP_DUMB_PREFERRED_DEPTH
>  #define DRM_CAP_DUMB_PREFERRED_DEPTH 3
> --
> 2.1.1
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel