From: Kasin Lee <kasin.li@amlogic.com>
Date: Mon, 25 Aug 2014 02:35:14 +0000 (+0800)
Subject: Merge commit 'c9f364194f5f942bc134438c087b1a0cd1fff2c8' into r4p0-01
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7bbe331717bcc6853032f3c62509879323a204a2;p=GitHub%2FLineageOS%2FG12%2Fandroid_hardware_amlogic_kernel-modules_mali-driver.git

Merge commit 'c9f364194f5f942bc134438c087b1a0cd1fff2c8' into r4p0-01
---

7bbe331717bcc6853032f3c62509879323a204a2
diff --cc mali/platform/mpgpu.c
index 8c63c33,e2d30aa..4eeecbc
--- a/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] */