freedreno/drm: Inline fd_bo_get_iova()

The struct body was originally hidden to avoid it being part of the ABI
between libdrm_freedreno and mesa.  But that is no longer a problem.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18646>

diff --git a/src/freedreno/drm/freedreno_bo.c b/src/freedreno/drm/freedreno_bo.c
index e0f7565..9c81148 100644 (file)
--- a/src/freedreno/drm/freedreno_bo.c
+++ b/src/freedreno/drm/freedreno_bo.c
@@ -255,14 +255,6 @@ fd_bo_mark_for_dump(struct fd_bo *bo)
    bo->reloc_flags |= FD_RELOC_DUMP;
 }
 
-uint64_t
-fd_bo_get_iova(struct fd_bo *bo)
-{
-   /* ancient kernels did not support this */
-   assert(bo->iova != 0);
-   return bo->iova;
-}
-
 struct fd_bo *
 fd_bo_ref(struct fd_bo *bo)
 {

diff --git a/src/freedreno/drm/freedreno_drmif.h b/src/freedreno/drm/freedreno_drmif.h
index 3463ce8..616b5b2 100644 (file)
--- a/src/freedreno/drm/freedreno_drmif.h
+++ b/src/freedreno/drm/freedreno_drmif.h
@@ -30,6 +30,7 @@
 #include <stdint.h>
 
 #include "util/bitset.h"
+#include "util/list.h"
 #include "util/u_debug.h"
 
 #ifdef __cplusplus
@@ -169,6 +170,63 @@ int fd_pipe_wait_timeout(struct fd_pipe *pipe, const struct fd_fence *fence,
 /* buffer-object functions:
  */
 
+struct fd_bo_fence {
+   /* For non-shared buffers, track the last pipe the buffer was active
+    * on, and the per-pipe fence value that indicates when the buffer is
+    * idle:
+    */
+   uint32_t fence;
+   struct fd_pipe *pipe;
+};
+
+struct fd_bo {
+   struct fd_device *dev;
+   uint32_t size;
+   uint32_t handle;
+   uint32_t name;
+   int32_t refcnt;
+   uint32_t reloc_flags; /* flags like FD_RELOC_DUMP to use for relocs to this BO */
+   uint32_t alloc_flags; /* flags that control allocation/mapping, ie. FD_BO_x */
+   uint64_t iova;
+   void *map;
+   const struct fd_bo_funcs *funcs;
+
+   enum {
+      NO_CACHE = 0,
+      BO_CACHE = 1,
+      RING_CACHE = 2,
+   } bo_reuse : 2;
+
+   /* Buffers that are shared (imported or exported) may be used in
+    * other processes, so we need to fallback to kernel to determine
+    * busyness.
+    */
+   bool shared : 1;
+
+   /* We need to be able to disable userspace fence synchronization for
+    * special internal buffers, namely the pipe->control buffer, to avoid
+    * a circular reference loop.
+    */
+   bool nosync : 1;
+
+   /* Most recent index in submit's bo table, used to optimize the common
+    * case where a bo is used many times in the same submit.
+    */
+   uint32_t idx;
+
+   struct list_head list; /* bucket-list entry */
+   time_t free_time;      /* time when added to bucket-list */
+
+   unsigned short nr_fences, max_fences;
+   struct fd_bo_fence *fences;
+
+   /* In the common case, there is no more than one fence attached.
+    * This provides storage for the fences table until it grows to
+    * be larger than a single element.
+    */
+   struct fd_bo_fence _inline_fence;
+};
+
 struct fd_bo *_fd_bo_new(struct fd_device *dev, uint32_t size, uint32_t flags);
 void _fd_bo_set_name(struct fd_bo *bo, const char *fmt, va_list ap);
 
@@ -211,7 +269,15 @@ struct fd_bo *fd_bo_from_handle(struct fd_device *dev, uint32_t handle,
 struct fd_bo *fd_bo_from_name(struct fd_device *dev, uint32_t name);
 struct fd_bo *fd_bo_from_dmabuf(struct fd_device *dev, int fd);
 void fd_bo_mark_for_dump(struct fd_bo *bo);
-uint64_t fd_bo_get_iova(struct fd_bo *bo);
+
+static inline uint64_t
+fd_bo_get_iova(struct fd_bo *bo)
+{
+   /* ancient kernels did not support this */
+   assert(bo->iova != 0);
+   return bo->iova;
+}
+
 struct fd_bo *fd_bo_ref(struct fd_bo *bo);
 void fd_bo_del(struct fd_bo *bo);
 int fd_bo_get_name(struct fd_bo *bo, uint32_t *name);

diff --git a/src/freedreno/drm/freedreno_priv.h b/src/freedreno/drm/freedreno_priv.h
index fceca64..ae137fc 100644 (file)
--- a/src/freedreno/drm/freedreno_priv.h
+++ b/src/freedreno/drm/freedreno_priv.h
@@ -320,62 +320,6 @@ struct fd_bo_funcs {
    bool (*prefer_upload)(struct fd_bo *bo, unsigned len);
 };
 
-struct fd_bo_fence {
-   /* For non-shared buffers, track the last pipe the buffer was active
-    * on, and the per-pipe fence value that indicates when the buffer is
-    * idle:
-    */
-   uint32_t fence;
-   struct fd_pipe *pipe;
-};
-
-struct fd_bo {
-   struct fd_device *dev;
-   uint32_t size;
-   uint32_t handle;
-   uint32_t name;
-   int32_t refcnt;
-   uint32_t reloc_flags; /* flags like FD_RELOC_DUMP to use for relocs to this BO */
-   uint32_t alloc_flags; /* flags that control allocation/mapping, ie. FD_BO_x */
-   uint64_t iova;
-   void *map;
-   const struct fd_bo_funcs *funcs;
-
-   enum {
-      NO_CACHE = 0,
-      BO_CACHE = 1,
-      RING_CACHE = 2,
-   } bo_reuse : 2;
-
-   /* Buffers that are shared (imported or exported) may be used in
-    * other processes, so we need to fallback to kernel to determine
-    * busyness.
-    */
-   bool shared : 1;
-
-   /* We need to be able to disable userspace fence synchronization for
-    * special internal buffers, namely the pipe->control buffer, to avoid
-    * a circular reference loop.
-    */
-   bool nosync : 1;
-
-   /* Most recent index in submit's bo table, used to optimize the common
-    * case where a bo is used many times in the same submit.
-    */
-   uint32_t idx;
-
-   struct list_head list; /* bucket-list entry */
-   time_t free_time;      /* time when added to bucket-list */
-
-   DECLARE_ARRAY(struct fd_bo_fence, fences);
-
-   /* In the common case, there is no more than one fence attached.
-    * This provides storage for the fences table until it grows to
-    * be larger than a single element.
-    */
-   struct fd_bo_fence _inline_fence;
-};
-
 void fd_bo_add_fence(struct fd_bo *bo, struct fd_pipe *pipe, uint32_t fence);
 
 enum fd_bo_state {