From bcc70a64a443ec19f84bb0dc3268d2c95b52e209 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 5 Jul 2011 15:38:11 +0100 Subject: [PATCH] gma500: Only fiddle with clock gating on PSB Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman --- drivers/staging/gma500/psb_powermgmt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 */