panfrost: Inline panfrost-misc.h into panfrost-job.h

We only need a small subset of the defines here.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6196>

diff --git a/src/gallium/drivers/panfrost/pan_screen.h b/src/gallium/drivers/panfrost/pan_screen.h
index 8f72185fb397e17fe61e17c619efc1a51d67deb3..6730bae7a2be3d59b3f79e2579c12c9446dec52f 100644 (file)
--- a/src/gallium/drivers/panfrost/pan_screen.h
+++ b/src/gallium/drivers/panfrost/pan_screen.h
@@ -37,7 +37,6 @@
 #include "util/bitset.h"
 #include "util/set.h"
 
-#include <panfrost-misc.h>
 #include "pan_device.h"
 #include "pan_pool.h"
 

diff --git a/src/panfrost/encoder/pan_bo.h b/src/panfrost/encoder/pan_bo.h
index 84d2a0aee988c9f3531e646e4e9fb1eff742a2a0..360b102de348108b84c3238f601f9df0f654fbd3 100644 (file)
--- a/src/panfrost/encoder/pan_bo.h
+++ b/src/panfrost/encoder/pan_bo.h
@@ -26,7 +26,6 @@
 #ifndef __PAN_BO_H__
 #define __PAN_BO_H__
 
-#include <panfrost-misc.h>
 #include "util/list.h"
 #include "pan_device.h"
 #include <time.h>

diff --git a/src/panfrost/encoder/pan_device.h b/src/panfrost/encoder/pan_device.h
index 8638ca554fe8f2cac8710414f59e78b37885be35..b84c8e7cdaeec84281eb5882e9a5ce63437545cd 100644 (file)
--- a/src/panfrost/encoder/pan_device.h
+++ b/src/panfrost/encoder/pan_device.h
@@ -37,7 +37,7 @@
 #include "util/list.h"
 #include "util/sparse_array.h"
 
-#include <panfrost-misc.h>
+#include <panfrost-job.h>
 
 /* Driver limits */
 #define PAN_MAX_CONST_BUFFERS 16

diff --git a/src/panfrost/encoder/pan_pool.h b/src/panfrost/encoder/pan_pool.h
index a619bd5e6ccac13191fbed2cb75d37523212d708..14593eabd4380f08c6277fd75a8fdededb0c310b 100644 (file)
--- a/src/panfrost/encoder/pan_pool.h
+++ b/src/panfrost/encoder/pan_pool.h
@@ -26,7 +26,7 @@
 #define __PAN_POOL_H__
 
 #include <stddef.h>
-#include <panfrost-misc.h>
+#include <panfrost-job.h>
 
 /* Represents a pool of memory that can only grow, used to allocate objects
  * with the same lifetime as the pool itself. In OpenGL, a pool is owned by the

diff --git a/src/panfrost/include/panfrost-job.h b/src/panfrost/include/panfrost-job.h
index ab0f8f7048fc3855b01e22b94b14d4edfae75733..a282c6e32e17753779a9d856bbc6d6ac310fd90d 100644 (file)
--- a/src/panfrost/include/panfrost-job.h
+++ b/src/panfrost/include/panfrost-job.h
@@ -30,7 +30,13 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <panfrost-misc.h>
+#include <inttypes.h>
+
+typedef uint8_t  u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+typedef uint64_t mali_ptr;
 
 enum mali_job_type {
         JOB_NOT_STARTED        = 0,