MALI: rockchip: upgrade DDK to r8p0-02rel0.

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / arm / midgard / mali_kbase_uku.h

diff --git a/drivers/gpu/arm/midgard/mali_kbase_uku.h b/drivers/gpu/arm/midgard/mali_kbase_uku.h
index 5943acb198746e28bb952746ac06dfce2184a4cc..39514685b75275a9742638705377884b26579393 100644 (file)
--- a/drivers/gpu/arm/midgard/mali_kbase_uku.h
+++ b/drivers/gpu/arm/midgard/mali_kbase_uku.h
@@ -41,8 +41,13 @@
 
 #include "mali_kbase_gpuprops_types.h"
 
+/*
+ * 10.1:
+ * - Do mmap in kernel for SAME_VA memory allocations rather then
+ *   calling back into the kernel as a 2nd stage of the allocation request.
+ */
 #define BASE_UK_VERSION_MAJOR 10
-#define BASE_UK_VERSION_MINOR 0
+#define BASE_UK_VERSION_MINOR 1
 
 struct kbase_uk_mem_alloc {
        union uk_header header;
@@ -354,7 +359,7 @@ struct kbase_uk_tlstream_flush {
 
 #if MALI_UNIT_TEST
 /**
- * struct kbase_uk_tlstream_acquire - User/Kernel space data exchange structure
+ * struct kbase_uk_tlstream_test - User/Kernel space data exchange structure
  * @header:    UK structure header
  * @tpw_count: number of trace point writers in each context
  * @msg_delay: time delay between tracepoints from one writer in milliseconds
@@ -375,7 +380,7 @@ struct kbase_uk_tlstream_test {
 };
 
 /**
- * struct kbase_uk_tlstream_acquire - User/Kernel space data exchange structure
+ * struct kbase_uk_tlstream_stats - User/Kernel space data exchange structure
  * @header:          UK structure header
  * @bytes_collected: number of bytes read by user
  * @bytes_generated: number of bytes generated by tracepoints
@@ -393,6 +398,20 @@ struct kbase_uk_tlstream_stats {
 #endif /* MALI_UNIT_TEST */
 #endif /* MALI_KTLSTREAM_ENABLED */
 
+/**
+ * struct struct kbase_uk_prfcnt_value for the KBASE_FUNC_SET_PRFCNT_VALUES ioctl
+ * @header:          UK structure header
+ * @data:            Counter samples for the dummy model
+ * @size:............Size of the counter sample data
+ */
+struct kbase_uk_prfcnt_values {
+       union uk_header header;
+       /* IN */
+       u32 *data;
+       u32 size;
+};
+
+
 enum kbase_uk_function_id {
        KBASE_FUNC_MEM_ALLOC = (UK_FUNC_ID + 0),
        KBASE_FUNC_MEM_IMPORT = (UK_FUNC_ID + 1),
@@ -456,6 +475,10 @@ enum kbase_uk_function_id {
 
        KBASE_FUNC_HWCNT_READER_SETUP = (UK_FUNC_ID + 36),
 
+#ifdef SUPPORT_MALI_NO_MALI
+       KBASE_FUNC_SET_PRFCNT_VALUES = (UK_FUNC_ID + 37),
+#endif
+
        KBASE_FUNC_MAX
 };