mali mess

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / misc / mediatek / gpu / mt8127 / mali / mali / common / mali_kernel_core.h

diff --git a/drivers/misc/mediatek/gpu/mt8127/mali/mali/common/mali_kernel_core.h b/drivers/misc/mediatek/gpu/mt8127/mali/mali/common/mali_kernel_core.h
index f0c0b0f69d7035b863e5b66a64a8cda7a4142d47..a5a40c7f926b12971935f396e7c071db34330682 100644 (file)
--- a/drivers/misc/mediatek/gpu/mt8127/mali/mali/common/mali_kernel_core.h
+++ b/drivers/misc/mediatek/gpu/mt8127/mali/mali/common/mali_kernel_core.h
@@ -1,7 +1,7 @@
 /*
  * This confidential and proprietary software may be used only as
  * authorised by a licensing agreement from ARM Limited
- * (C) COPYRIGHT 2007-2013 ARM Limited
+ * (C) COPYRIGHT 2007-2015 ARM Limited
  * ALL RIGHTS RESERVED
  * The entire notice above must be reproduced on all authorised
  * copies and copies may only be made to the extent permitted
@@ -19,9 +19,11 @@ typedef enum {
        _MALI_PRODUCT_ID_MALI300,
        _MALI_PRODUCT_ID_MALI400,
        _MALI_PRODUCT_ID_MALI450,
+       _MALI_PRODUCT_ID_MALI470,
 } _mali_product_id_t;
 
 extern mali_bool mali_gpu_class_is_mali450;
+extern mali_bool mali_gpu_class_is_mali470;
 
 _mali_osk_errcode_t mali_initialize_subsystems(void);
 
@@ -33,24 +35,23 @@ u32 mali_kernel_core_get_gpu_major_version(void);
 
 u32 mali_kernel_core_get_gpu_minor_version(void);
 
-u32 _mali_kernel_core_dump_state(char* buf, u32 size);
+u32 _mali_kernel_core_dump_state(char *buf, u32 size);
+
+MALI_STATIC_INLINE mali_bool mali_is_mali470(void)
+{
+       return mali_gpu_class_is_mali470;
+}
 
 MALI_STATIC_INLINE mali_bool mali_is_mali450(void)
 {
-#if defined(CONFIG_MALI450)
        return mali_gpu_class_is_mali450;
-#else
-       return MALI_FALSE;
-#endif
 }
 
 MALI_STATIC_INLINE mali_bool mali_is_mali400(void)
 {
-#if !defined(CONFIG_MALI450)
+       if (mali_gpu_class_is_mali450 || mali_gpu_class_is_mali470)
+               return MALI_FALSE;
+
        return MALI_TRUE;
-#else
-       return !mali_gpu_class_is_mali450;
-#endif
 }
-
 #endif /* __MALI_KERNEL_CORE_H__ */