Merge branch 'mali-dev' of 10.8.9.5:/platform/hardware/arm/gpu into mali-dev

Conflicts:
	mali/platform/meson_m450/platform_m8.c
	mali/platform/meson_main.h
	mali/platform/mpgpu.c

diff --cc mali/common/mali_pmu.c
index 6e2439bd7ffa1dc13d9cca51d634c0bde22dd903,ea31f3ccb763db51717fe6c4f4b8dcd85913260e..ec782a99802bfff3a30f8e78dffbb01d6c6d9dba
mode 100644,100755..100755
--- 1/mali/common/mali_pmu.c
--- 2/mali/common/mali_pmu.c
+++ b/mali/common/mali_pmu.c

diff --cc mali/platform/meson_m450/scaling_m8.c
Simple merge

diff --cc mali/platform/mpgpu.c
index a60b6c7056977be25e8d4057427490befe3ab7a5,8497b3ce4812ed31f62b9e44c9a7d7daf420bf79..f556de3dcb664b2b8308aec19a7585c3946121f6
--- 1/mali/platform/mpgpu.c
--- 2/mali/platform/mpgpu.c
+++ b/mali/platform/mpgpu.c
@@@ -31,7 -31,7 +31,8 @@@ static ssize_t domain_stat_read(struct 
                        struct class_attribute *attr, char *buf)
  {
        unsigned int val;
 -#if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON8
++
 +#if MESON_CPU_TYPE > MESON_CPU_TYPE_MESON6TV
        val = mali_pmu_get_status();
  #else
        val = 0;