[Mesa-dev,04/27] gallium: introduce memory object v2

Submitted by Andres Rodriguez on July 12, 2017, 10:45 p.m.

Details

Message ID 20170712224532.1307-5-andresx7@gmail.com
State New
Headers show
Series "Initial support for EXT_external_objects v3" ( rev: 3 2 1 ) in Mesa

Not browsing as part of any series.

Commit Message

Andres Rodriguez July 12, 2017, 10:45 p.m.
From: Dave Airlie <airlied@redhat.com>

v2: fix comment regarding fd ownership, define pipe_memory_object
---
 src/gallium/drivers/ddebug/dd_screen.c | 40 ++++++++++++++++++++++++++++++++++
 src/gallium/include/pipe/p_screen.h    | 36 ++++++++++++++++++++++++++++++
 src/gallium/include/pipe/p_state.h     |  8 +++++++
 3 files changed, 84 insertions(+)

Patch hide | download patch | download mbox

diff --git a/src/gallium/drivers/ddebug/dd_screen.c b/src/gallium/drivers/ddebug/dd_screen.c
index a5d2be1..fe9c841 100644
--- a/src/gallium/drivers/ddebug/dd_screen.c
+++ b/src/gallium/drivers/ddebug/dd_screen.c
@@ -245,6 +245,22 @@  dd_screen_resource_from_user_memory(struct pipe_screen *_screen,
    return res;
 }
 
+static struct pipe_resource *
+dd_screen_resource_from_memobj(struct pipe_screen *_screen,
+                               const struct pipe_resource *templ,
+                               struct pipe_memory_object *memobj,
+                               uint64_t offset)
+{
+   struct pipe_screen *screen = dd_screen(_screen)->screen;
+   struct pipe_resource *res =
+      screen->resource_from_memobj(screen, templ, memobj, offset);
+
+   if (!res)
+      return NULL;
+   res->screen = _screen;
+   return res;
+}
+
 static void
 dd_screen_resource_changed(struct pipe_screen *_screen,
                            struct pipe_resource *res)
@@ -303,7 +319,28 @@  dd_screen_fence_finish(struct pipe_screen *_screen,
    return screen->fence_finish(screen, ctx, fence, timeout);
 }
 
+/********************************************************************
+ * memobj
+ */
+
+static struct pipe_memory_object *
+dd_screen_memobj_create_from_handle(struct pipe_screen *_screen,
+                                    struct winsys_handle *handle,
+                                    bool dedicated)
+{
+   struct pipe_screen *screen = dd_screen(_screen)->screen;
+
+   return screen->memobj_create_from_handle(screen, handle, dedicated);
+}
+
+static void
+dd_screen_memobj_destroy(struct pipe_screen *_screen,
+                         struct pipe_memory_object *memobj)
+{
+   struct pipe_screen *screen = dd_screen(_screen)->screen;
 
+   return screen->memobj_destroy(screen, memobj);
+}
 /********************************************************************
  * screen
  */
@@ -412,6 +449,7 @@  ddebug_screen_create(struct pipe_screen *screen)
    SCR_INIT(can_create_resource);
    dscreen->base.resource_create = dd_screen_resource_create;
    dscreen->base.resource_from_handle = dd_screen_resource_from_handle;
+   SCR_INIT(resource_from_memobj);
    SCR_INIT(resource_from_user_memory);
    dscreen->base.resource_get_handle = dd_screen_resource_get_handle;
    SCR_INIT(resource_changed);
@@ -419,6 +457,8 @@  ddebug_screen_create(struct pipe_screen *screen)
    SCR_INIT(flush_frontbuffer);
    SCR_INIT(fence_reference);
    SCR_INIT(fence_finish);
+   SCR_INIT(memobj_create_from_handle);
+   SCR_INIT(memobj_destroy);
    SCR_INIT(get_driver_query_info);
    SCR_INIT(get_driver_query_group_info);
    SCR_INIT(get_compiler_options);
diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h
index 65e954a..d81625c 100644
--- a/src/gallium/include/pipe/p_screen.h
+++ b/src/gallium/include/pipe/p_screen.h
@@ -357,6 +357,42 @@  struct pipe_screen {
                                   enum pipe_format format, int max,
                                   uint64_t *modifiers,
                                   unsigned int *external_only, int *count);
+
+   /**
+    * Create a memory object from a winsys handle
+    *
+    * The underlying memory is most often allocated in by a foregin API.
+    * Then the underlying memory object is then exported through interfaces
+    * compatible with EXT_external_resources.
+    *
+    * Note: For DRM_API_HANDLE_TYPE_FD handles, the caller retains ownership
+    * of the fd.
+    *
+    * \param handle  A handle representing the memory object to import
+    */
+   struct pipe_memory_object *(*memobj_create_from_handle)(struct pipe_screen *screen,
+                                                           struct winsys_handle *handle,
+                                                           bool dedicated);
+
+   /**
+    * Destroy a memory object
+    *
+    * \param memobj  The memory object to destroy
+    */
+   void (*memobj_destroy)(struct pipe_screen *screen,
+                          struct pipe_memory_object *memobj);
+
+   /**
+    * Create a texture from a memory object
+    *
+    * \param t       texture template
+    * \param memobj  The memory object used to back the texture
+    */
+   struct pipe_resource * (*resource_from_memobj)(struct pipe_screen *screen,
+                                                  const struct pipe_resource *t,
+                                                  struct pipe_memory_object *memobj,
+                                                  uint64_t offset);
+
 };
 
 
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 15be8cb..86c7751 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -888,6 +888,14 @@  struct pipe_memory_info
    unsigned nr_device_memory_evictions; /**< # of evictions (monotonic counter) */
 };
 
+/**
+ * Structure that contains information about external memory
+ */
+struct pipe_memory_object
+{
+   bool dedicated;
+};
+
 #ifdef __cplusplus
 }
 #endif

Comments

On Thu, Jul 13, 2017 at 12:45 AM, Andres Rodriguez <andresx7@gmail.com> wrote:
> From: Dave Airlie <airlied@redhat.com>
>
> v2: fix comment regarding fd ownership, define pipe_memory_object
> ---
>  src/gallium/drivers/ddebug/dd_screen.c | 40 ++++++++++++++++++++++++++++++++++
>  src/gallium/include/pipe/p_screen.h    | 36 ++++++++++++++++++++++++++++++
>  src/gallium/include/pipe/p_state.h     |  8 +++++++
>  3 files changed, 84 insertions(+)
>
> diff --git a/src/gallium/drivers/ddebug/dd_screen.c b/src/gallium/drivers/ddebug/dd_screen.c
> index a5d2be1..fe9c841 100644
> --- a/src/gallium/drivers/ddebug/dd_screen.c
> +++ b/src/gallium/drivers/ddebug/dd_screen.c
> @@ -245,6 +245,22 @@ dd_screen_resource_from_user_memory(struct pipe_screen *_screen,
>     return res;
>  }
>
> +static struct pipe_resource *
> +dd_screen_resource_from_memobj(struct pipe_screen *_screen,
> +                               const struct pipe_resource *templ,
> +                               struct pipe_memory_object *memobj,
> +                               uint64_t offset)
> +{
> +   struct pipe_screen *screen = dd_screen(_screen)->screen;
> +   struct pipe_resource *res =
> +      screen->resource_from_memobj(screen, templ, memobj, offset);
> +
> +   if (!res)
> +      return NULL;
> +   res->screen = _screen;
> +   return res;
> +}
> +
>  static void
>  dd_screen_resource_changed(struct pipe_screen *_screen,
>                             struct pipe_resource *res)
> @@ -303,7 +319,28 @@ dd_screen_fence_finish(struct pipe_screen *_screen,
>     return screen->fence_finish(screen, ctx, fence, timeout);
>  }
>
> +/********************************************************************
> + * memobj
> + */
> +
> +static struct pipe_memory_object *
> +dd_screen_memobj_create_from_handle(struct pipe_screen *_screen,
> +                                    struct winsys_handle *handle,
> +                                    bool dedicated)
> +{
> +   struct pipe_screen *screen = dd_screen(_screen)->screen;
> +
> +   return screen->memobj_create_from_handle(screen, handle, dedicated);
> +}
> +
> +static void
> +dd_screen_memobj_destroy(struct pipe_screen *_screen,
> +                         struct pipe_memory_object *memobj)
> +{
> +   struct pipe_screen *screen = dd_screen(_screen)->screen;
>
> +   return screen->memobj_destroy(screen, memobj);

stray "return"

With that fixed, this patch is:

Reviewed-by: Marek Olšák <marek.olsak@amd.com>

Marek