[Mesa-dev] [PATCH 2/4] vl: add drm support for vl_screen

[Emil Velikov]

On 5 November 2015 at 18:47, Leo Liu <leo.liu at amd.com> wrote:
> This will allow the state trackers to use render nodes
> with screen creation
>
> Signed-off-by: Leo Liu <leo.liu at amd.com>
> ---
>  src/gallium/auxiliary/Makefile.sources   |  3 +-
>  src/gallium/auxiliary/vl/vl_winsys.h     |  6 +++
>  src/gallium/auxiliary/vl/vl_winsys_drm.c | 76 ++++++++++++++++++++++++++++++++
>  3 files changed, 84 insertions(+), 1 deletion(-)
>  create mode 100644 src/gallium/auxiliary/vl/vl_winsys_drm.c
>
> diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
> index 6e22ced..82ef5ec 100644
> --- a/src/gallium/auxiliary/Makefile.sources
> +++ b/src/gallium/auxiliary/Makefile.sources
> @@ -349,7 +349,8 @@ VL_SOURCES := \
>
>  # XXX: Nuke this as our dri targets no longer depend on VL.
>  VL_WINSYS_SOURCES := \
> -       vl/vl_winsys_dri.c
> +       vl/vl_winsys_dri.c \
> +       vl/vl_winsys_drm.c
>
>  VL_STUB_SOURCES := \
>         vl/vl_stubs.c
> diff --git a/src/gallium/auxiliary/vl/vl_winsys.h b/src/gallium/auxiliary/vl/vl_winsys.h
> index f6b47c9..df01917 100644
> --- a/src/gallium/auxiliary/vl/vl_winsys.h
> +++ b/src/gallium/auxiliary/vl/vl_winsys.h
> @@ -66,4 +66,10 @@ vl_screen_set_next_timestamp(struct vl_screen *vscreen, uint64_t stamp);
>  void*
>  vl_screen_get_private(struct vl_screen *vscreen);
>
> +struct vl_screen*
> +vl_drm_screen_create(int fd);
> +
> +void
> +vl_drm_screen_destroy(struct vl_screen *vscreen);
> +
>  #endif
> diff --git a/src/gallium/auxiliary/vl/vl_winsys_drm.c b/src/gallium/auxiliary/vl/vl_winsys_drm.c
> new file mode 100644
> index 0000000..65b74eb
> --- /dev/null
> +++ b/src/gallium/auxiliary/vl/vl_winsys_drm.c
> @@ -0,0 +1,76 @@
> +/**************************************************************************
> + *
> + * Copyright 2009 Younes Manton.
> + * All Rights Reserved.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the
> + * "Software"), to deal in the Software without restriction, including
> + * without limitation the rights to use, copy, modify, merge, publish,
> + * distribute, sub license, and/or sell copies of the Software, and to
> + * permit persons to whom the Software is furnished to do so, subject to
> + * the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the
> + * next paragraph) shall be included in all copies or substantial portions
> + * of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
> + * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
> + * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
> + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
> + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
> + *
> + **************************************************************************/
> +
> +#include <assert.h>
> +
> +#include "pipe/p_screen.h"
> +#include "pipe-loader/pipe_loader.h"
> +
> +#include "util/u_memory.h"
> +#include "vl/vl_winsys.h"
> +
> +struct vl_screen*
> +vl_drm_screen_create(int fd)
> +{
> +   struct vl_screen *vscreen;
> +
> +   vscreen = CALLOC_STRUCT(vl_screen);
> +   if (!vscreen)
> +      return NULL;
> +
> +#if GALLIUM_STATIC_TARGETS
> +   vscreen->pscreen = dd_create_screen(fd);
> +#else
> +   if (pipe_loader_drm_probe_fd(&vscreen->dev, fd)) {
Add a dup() in the above. So that it reads

if (pipe_loader_drm_probe_fd(&vscreen->dev, dup(fd))) {

Thanks
Emil