panfrost: Sync UAPI header from kernel

Sync the panfrost_drm.h UAPI header with the latest from the kernel.
This adds madvise ioctl and GPU feature params.

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: Rob Herring <robh@kernel.org>

diff --git a/include/drm-uapi/panfrost_drm.h b/include/drm-uapi/panfrost_drm.h
index 9150dd75aad8d1887fcc2116bbfb3081665fe616..ec19db1eead8649567739b0f8b082079c0183e13 100644 (file)
--- a/include/drm-uapi/panfrost_drm.h
+++ b/include/drm-uapi/panfrost_drm.h
@@ -20,6 +20,7 @@ extern "C" {
 #define DRM_PANFROST_GET_BO_OFFSET             0x05
 #define DRM_PANFROST_PERFCNT_ENABLE            0x06
 #define DRM_PANFROST_PERFCNT_DUMP              0x07
+#define DRM_PANFROST_MADVISE                   0x08
 
 #define DRM_IOCTL_PANFROST_SUBMIT              DRM_IOW(DRM_COMMAND_BASE + DRM_PANFROST_SUBMIT, struct drm_panfrost_submit)
 #define DRM_IOCTL_PANFROST_WAIT_BO             DRM_IOW(DRM_COMMAND_BASE + DRM_PANFROST_WAIT_BO, struct drm_panfrost_wait_bo)
@@ -27,6 +28,7 @@ extern "C" {
 #define DRM_IOCTL_PANFROST_MMAP_BO             DRM_IOWR(DRM_COMMAND_BASE + DRM_PANFROST_MMAP_BO, struct drm_panfrost_mmap_bo)
 #define DRM_IOCTL_PANFROST_GET_PARAM           DRM_IOWR(DRM_COMMAND_BASE + DRM_PANFROST_GET_PARAM, struct drm_panfrost_get_param)
 #define DRM_IOCTL_PANFROST_GET_BO_OFFSET       DRM_IOWR(DRM_COMMAND_BASE + DRM_PANFROST_GET_BO_OFFSET, struct drm_panfrost_get_bo_offset)
+#define DRM_IOCTL_PANFROST_MADVISE             DRM_IOWR(DRM_COMMAND_BASE + DRM_PANFROST_MADVISE, struct drm_panfrost_madvise)
 
 /*
  * Unstable ioctl(s): only exposed when the unsafe unstable_ioctls module
@@ -130,6 +132,45 @@ struct drm_panfrost_mmap_bo {
 
 enum drm_panfrost_param {
        DRM_PANFROST_PARAM_GPU_PROD_ID,
+       DRM_PANFROST_PARAM_GPU_REVISION,
+       DRM_PANFROST_PARAM_SHADER_PRESENT,
+       DRM_PANFROST_PARAM_TILER_PRESENT,
+       DRM_PANFROST_PARAM_L2_PRESENT,
+       DRM_PANFROST_PARAM_STACK_PRESENT,
+       DRM_PANFROST_PARAM_AS_PRESENT,
+       DRM_PANFROST_PARAM_JS_PRESENT,
+       DRM_PANFROST_PARAM_L2_FEATURES,
+       DRM_PANFROST_PARAM_CORE_FEATURES,
+       DRM_PANFROST_PARAM_TILER_FEATURES,
+       DRM_PANFROST_PARAM_MEM_FEATURES,
+       DRM_PANFROST_PARAM_MMU_FEATURES,
+       DRM_PANFROST_PARAM_THREAD_FEATURES,
+       DRM_PANFROST_PARAM_MAX_THREADS,
+       DRM_PANFROST_PARAM_THREAD_MAX_WORKGROUP_SZ,
+       DRM_PANFROST_PARAM_THREAD_MAX_BARRIER_SZ,
+       DRM_PANFROST_PARAM_COHERENCY_FEATURES,
+       DRM_PANFROST_PARAM_TEXTURE_FEATURES0,
+       DRM_PANFROST_PARAM_TEXTURE_FEATURES1,
+       DRM_PANFROST_PARAM_TEXTURE_FEATURES2,
+       DRM_PANFROST_PARAM_TEXTURE_FEATURES3,
+       DRM_PANFROST_PARAM_JS_FEATURES0,
+       DRM_PANFROST_PARAM_JS_FEATURES1,
+       DRM_PANFROST_PARAM_JS_FEATURES2,
+       DRM_PANFROST_PARAM_JS_FEATURES3,
+       DRM_PANFROST_PARAM_JS_FEATURES4,
+       DRM_PANFROST_PARAM_JS_FEATURES5,
+       DRM_PANFROST_PARAM_JS_FEATURES6,
+       DRM_PANFROST_PARAM_JS_FEATURES7,
+       DRM_PANFROST_PARAM_JS_FEATURES8,
+       DRM_PANFROST_PARAM_JS_FEATURES9,
+       DRM_PANFROST_PARAM_JS_FEATURES10,
+       DRM_PANFROST_PARAM_JS_FEATURES11,
+       DRM_PANFROST_PARAM_JS_FEATURES12,
+       DRM_PANFROST_PARAM_JS_FEATURES13,
+       DRM_PANFROST_PARAM_JS_FEATURES14,
+       DRM_PANFROST_PARAM_JS_FEATURES15,
+       DRM_PANFROST_PARAM_NR_CORE_GROUPS,
+       DRM_PANFROST_PARAM_THREAD_TLS_ALLOC,
 };
 
 struct drm_panfrost_get_param {
@@ -162,6 +203,26 @@ struct drm_panfrost_perfcnt_dump {
        __u64 buf_ptr;
 };
 
+/* madvise provides a way to tell the kernel in case a buffers contents
+ * can be discarded under memory pressure, which is useful for userspace
+ * bo cache where we want to optimistically hold on to buffer allocate
+ * and potential mmap, but allow the pages to be discarded under memory
+ * pressure.
+ *
+ * Typical usage would involve madvise(DONTNEED) when buffer enters BO
+ * cache, and madvise(WILLNEED) if trying to recycle buffer from BO cache.
+ * In the WILLNEED case, 'retained' indicates to userspace whether the
+ * backing pages still exist.
+ */
+#define PANFROST_MADV_WILLNEED 0       /* backing pages are needed, status returned in 'retained' */
+#define PANFROST_MADV_DONTNEED 1       /* backing pages not needed */
+
+struct drm_panfrost_madvise {
+       __u32 handle;         /* in, GEM handle */
+       __u32 madv;           /* in, PANFROST_MADV_x */
+       __u32 retained;       /* out, whether backing store still exists */
+};
+
 #if defined(__cplusplus)
 }
 #endif