amd,radeonsi: rename radeon_winsys_cs -> radeon_cmdbuf

[mesa.git] / src / gallium / winsys / radeon / drm / radeon_drm_cs.h

diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_cs.h b/src/gallium/winsys/radeon/drm/radeon_drm_cs.h
index 4cc97f37e09ed38c27f2726f1ff90efe45873f28..75fb09bd0010fbea128b480117ca9fe2809214c4 100644 (file)
--- a/src/gallium/winsys/radeon/drm/radeon_drm_cs.h
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_cs.h
@@ -28,33 +28,45 @@
 #define RADEON_DRM_CS_H
 
 #include "radeon_drm_bo.h"
-#include <radeon_drm.h>
+
+struct radeon_bo_item {
+    struct radeon_bo    *bo;
+    union {
+        struct {
+            uint64_t    priority_usage;
+        } real;
+        struct {
+            unsigned    real_idx;
+        } slab;
+    } u;
+};
 
 struct radeon_cs_context {
-    uint32_t                    buf[R300_MAX_CMDBUF_DWORDS];
+    uint32_t                    buf[16 * 1024];
 
-    int fd;
+    int                         fd;
     struct drm_radeon_cs        cs;
-    struct drm_radeon_cs_chunk  chunks[2];
-    uint64_t                    chunk_array[2];
-
-    /* Relocs. */
-    unsigned                    nrelocs;
-    unsigned                    crelocs;
-    struct radeon_bo            **relocs_bo;
+    struct drm_radeon_cs_chunk  chunks[3];
+    uint64_t                    chunk_array[3];
+    uint32_t                    flags[2];
+
+    /* Buffers. */
+    unsigned                    max_relocs;
+    unsigned                    num_relocs;
+    unsigned                    num_validated_relocs;
+    struct radeon_bo_item       *relocs_bo;
     struct drm_radeon_cs_reloc  *relocs;
 
-    /* 0 = BO not added, 1 = BO added */
-    char                        is_handle_added[256];
-    struct drm_radeon_cs_reloc  *relocs_hashlist[256];
-    unsigned                    reloc_indices_hashlist[256];
+    unsigned                    num_slab_buffers;
+    unsigned                    max_slab_buffers;
+    struct radeon_bo_item       *slab_buffers;
 
-    unsigned used_vram;
-    unsigned used_gart;
+    int                         reloc_indices_hashlist[4096];
 };
 
 struct radeon_drm_cs {
-    struct r300_winsys_cs base;
+    struct radeon_cmdbuf base;
+    enum ring_type          ring_type;
 
     /* We flip between these two CS. While one is being consumed
      * by the kernel in another thread, the other one is being filled
@@ -70,34 +82,57 @@ struct radeon_drm_cs {
     struct radeon_drm_winsys *ws;
 
     /* Flush CS. */
-    void (*flush_cs)(void *);
+    void (*flush_cs)(void *ctx, unsigned flags, struct pipe_fence_handle **fence);
     void *flush_data;
 
-    pipe_thread thread;
+    struct util_queue_fence flush_completed;
+    struct pipe_fence_handle *next_fence;
 };
 
-int radeon_get_reloc(struct radeon_cs_context *csc, struct radeon_bo *bo);
+int radeon_lookup_buffer(struct radeon_cs_context *csc, struct radeon_bo *bo);
 
-static INLINE struct radeon_drm_cs *
-radeon_drm_cs(struct r300_winsys_cs *base)
+static inline struct radeon_drm_cs *
+radeon_drm_cs(struct radeon_cmdbuf *base)
 {
     return (struct radeon_drm_cs*)base;
 }
 
-static INLINE boolean radeon_bo_is_referenced_by_cs(struct radeon_drm_cs *cs,
-                                                    struct radeon_bo *bo)
+static inline bool
+radeon_bo_is_referenced_by_cs(struct radeon_drm_cs *cs,
+                              struct radeon_bo *bo)
+{
+    int num_refs = bo->num_cs_references;
+    return num_refs == bo->rws->num_cs ||
+           (num_refs && radeon_lookup_buffer(cs->csc, bo) != -1);
+}
+
+static inline bool
+radeon_bo_is_referenced_by_cs_for_write(struct radeon_drm_cs *cs,
+                                        struct radeon_bo *bo)
 {
-    return bo->num_cs_references == bo->rws->num_cs ||
-           (bo->num_cs_references && radeon_get_reloc(cs->csc, bo) != -1);
+    int index;
+
+    if (!bo->num_cs_references)
+        return false;
+
+    index = radeon_lookup_buffer(cs->csc, bo);
+    if (index == -1)
+        return false;
+
+    if (!bo->handle)
+        index = cs->csc->slab_buffers[index].u.slab.real_idx;
+
+    return cs->csc->relocs[index].write_domain != 0;
 }
 
-static INLINE boolean radeon_bo_is_referenced_by_any_cs(struct radeon_bo *bo)
+static inline bool
+radeon_bo_is_referenced_by_any_cs(struct radeon_bo *bo)
 {
-    return bo->num_cs_references;
+    return bo->num_cs_references != 0;
 }
 
-void radeon_drm_cs_flush(struct r300_winsys_cs *rcs);
-void radeon_drm_cs_sync_flush(struct r300_winsys_cs *rcs);
+void radeon_drm_cs_sync_flush(struct radeon_cmdbuf *rcs);
 void radeon_drm_cs_init_functions(struct radeon_drm_winsys *ws);
+void radeon_drm_cs_emit_ioctl_oneshot(void *job, int thread_index);
 
 #endif