panfrost: Reword comment

[mesa.git] / src / gallium / drivers / panfrost / pan_screen.h

diff --git a/src/gallium/drivers/panfrost/pan_screen.h b/src/gallium/drivers/panfrost/pan_screen.h
index dde745fb0ed2f7b4c58f01d19b1c47b4733632b2..6730bae7a2be3d59b3f79e2579c12c9446dec52f 100644 (file)
--- a/src/gallium/drivers/panfrost/pan_screen.h
+++ b/src/gallium/drivers/panfrost/pan_screen.h
@@ -37,68 +37,16 @@
 #include "util/bitset.h"
 #include "util/set.h"
 
-#include <panfrost-misc.h>
-#include "pan_allocate.h"
+#include "pan_device.h"
+#include "pan_pool.h"
 
 struct panfrost_batch;
 struct panfrost_context;
 struct panfrost_resource;
-struct panfrost_screen;
-
-/* Driver limits */
-#define PAN_MAX_CONST_BUFFERS 16
-
-/* Transient slab size. This is a balance between fragmentation against cache
- * locality and ease of bookkeeping */
-
-#define TRANSIENT_SLAB_PAGES (32) /* 128kb */
-#define TRANSIENT_SLAB_SIZE (4096 * TRANSIENT_SLAB_PAGES)
-
-/* Maximum number of transient slabs so we don't need dynamic arrays. Most
- * interesting Mali boards are 4GB RAM max, so if the entire RAM was filled
- * with transient slabs, you could never exceed (4GB / TRANSIENT_SLAB_SIZE)
- * allocations anyway. By capping, we can use a fixed-size bitset for tracking
- * free slabs, eliminating quite a bit of complexity. We can pack the free
- * state of 8 slabs into a single byte, so for 128kb transient slabs the bitset
- * occupies a cheap 4kb of memory */
-
-#define MAX_TRANSIENT_SLABS (1024*1024 / TRANSIENT_SLAB_PAGES)
-
-/* How many power-of-two levels in the BO cache do we want? 2^12
- * minimum chosen as it is the page size that all allocations are
- * rounded to */
-
-#define MIN_BO_CACHE_BUCKET (12) /* 2^12 = 4KB */
-#define MAX_BO_CACHE_BUCKET (22) /* 2^22 = 4MB */
-
-/* Fencepost problem, hence the off-by-one */
-#define NR_BO_CACHE_BUCKETS (MAX_BO_CACHE_BUCKET - MIN_BO_CACHE_BUCKET + 1)
 
 struct panfrost_screen {
         struct pipe_screen base;
-        int fd;
-
-        /* Properties of the GPU in use */
-        unsigned gpu_id;
-        bool require_sfbd;
-
-        drmVersionPtr kernel_version;
-
-        struct renderonly *ro;
-
-        pthread_mutex_t active_bos_lock;
-        struct set *active_bos;
-
-        struct {
-                pthread_mutex_t lock;
-
-                /* The BO cache is a set of buckets with power-of-two sizes
-                 * ranging from 2^12 (4096, the page size) to
-                 * 2^(12 + MAX_BO_CACHE_BUCKETS).
-                 * Each bucket is a linked list of free panfrost_bo objects. */
-
-                struct list_head buckets[NR_BO_CACHE_BUCKETS];
-        } bo_cache;
+        struct panfrost_device dev;
 };
 
 static inline struct panfrost_screen *
@@ -107,8 +55,13 @@ pan_screen(struct pipe_screen *p)
         return (struct panfrost_screen *)p;
 }
 
+static inline struct panfrost_device *
+pan_device(struct pipe_screen *p)
+{
+        return &(pan_screen(p)->dev);
+}
+
 struct panfrost_fence *
-panfrost_fence_create(struct panfrost_context *ctx,
-                      struct util_dynarray *fences);
+panfrost_fence_create(struct panfrost_context *ctx, uint32_t syncobj);
 
 #endif /* PAN_SCREEN_H */