Merge branch 'r4p0-01' of git://git.myamlogic.com/platform/hardware/arm/gpu into...

Conflicts:
	mali/Kbuild
	mali/platform/meson_m450/platform_m6tvd.c
	mali/platform/meson_m450/scaling.c

diff --cc mali/Kbuild
index cc72e1a3625e26f7884c80fb93742058d291f191,34762a6752e648265b1a348425dd0a0262ecc580..e8331982b85358e368a74eff8b9ecffc2665c4d4
--- 1/mali/Kbuild
--- 2/mali/Kbuild
+++ b/mali/Kbuild
@@@ -171,6 -171,13 +171,12 @@@ mali-$(CONFIG_ARCH_MESON6TVD) += 
  
  mali-$(CONFIG_ARCH_MESON8B) += \
        platform/meson_m450/platform_m8b.o
 -
+ 
+ mali-$(CONFIG_ARCH_MESON8M2) += \
+       platform/meson_m450/platform_m8m2.o
+ 
+ mali-$(CONFIG_ARCH_MESONG9TV) += \
+       platform/meson_m450/platform_g9tv.o
  endif
  ##################### end Kasin Added. ###################
  

diff --cc mali/platform/meson_m450/scaling.c
index 98d42d42dff945ad77710c50939768afb2147d9e,cf9edd5f74b21749f88e98f69189b8d55392a747..57e9f694cdd80605495c8f6af034b0458832914c
--- 1/mali/platform/meson_m450/scaling.c
--- 2/mali/platform/meson_m450/scaling.c
+++ b/mali/platform/meson_m450/scaling.c
@@@ -24,7 -24,7 +24,11 @@@
  
  #include <meson_main.h>
  
++<<<<<<< HEAD
 +#define LOG_MALI_SCALING 1
++=======
+ #define LOG_MALI_SCALING 0
++>>>>>>> ae39dbaec5c0ea26fafeaf557ce022c55a9ad899
  
  static int num_cores_enabled;
  static int currentStep;