From: Alan Cox <alan@linux.intel.com>
Date: Tue, 5 Jul 2011 14:38:11 +0000 (+0100)
Subject: gma500: Only fiddle with clock gating on PSB
X-Git-Tag: MMI-PSA29.97-13-9~18845^2~409
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bcc70a64a443ec19f84bb0dc3268d2c95b52e209;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

gma500: Only fiddle with clock gating on PSB

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/gma500/psb_powermgmt.c b/drivers/staging/gma500/psb_powermgmt.c
index f837ab0608ce..2253ecbfd61c 100644
--- a/drivers/staging/gma500/psb_powermgmt.c
+++ b/drivers/staging/gma500/psb_powermgmt.c
@@ -64,7 +64,7 @@ void gma_power_init(struct drm_device *dev)
 	dev_priv->suspended = false;	/* And not suspended */
 	mutex_init(&power_mutex);
 
-	if (!IS_MRST(dev)) {
+	if (!IS_MRST(dev) && !IS_MFLD(dev)) {
 		/* FIXME: wants further review */
 		u32 gating = PSB_RSGX32(PSB_CR_CLKGATECTL);
 		/* Disable 2D clock gating */