Merge commit 'c9f364194f5f942bc134438c087b1a0cd1fff2c8' into r4p0-01

diff --cc mali/platform/mpgpu.c
index 8c63c33c8bc4d04f3628fcfa0da9ac91b2742114,e2d30aa867b7a64ce237d02ad7e641a1c63cb2ec..4eeecbc88dcf7dc593bfb29bc8e49b32a7db334f
--- 1/mali/platform/mpgpu.c
--- 2/mali/platform/mpgpu.c
+++ b/mali/platform/mpgpu.c
@@@ -34,13 -33,16 +35,13 @@@ static ssize_t domain_stat_read(struct 
  {
        unsigned int val;
  #if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON8
 -      if (mali_pm_statue == 1) {
 -              val = mali_pmu_get_status();
 -      } else
 -              val = 0x7;
 +      val = readl((u32 *)(IO_AOBUS_BASE + 0xf0)) & 0xff;
  #else
 -      val = 0;
 +      val = 0xffffffff;
  #endif
 -      return sprintf(buf, "%x\n", val);
 +      return sprintf(buf, "%x\n", val>>4);
  }
- 
+ #endif
  #if MESON_CPU_TYPE > MESON_CPU_TYPE_MESON6TVD
  #define PREHEAT_CMD "preheat"
  #define PLL2_CMD "mpl2"  /* mpl2 [11] or [0xxxxxxx] */