From b39f08359e778a109a8df137dc25cfa0f11d8daf Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 5 Jul 2011 15:38:11 +0100 Subject: [PATCH] --- yaml --- r: 259674 b: refs/heads/master c: bcc70a64a443ec19f84bb0dc3268d2c95b52e209 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/gma500/psb_powermgmt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bc539f4fd609..e147bd7973ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5338afdfb5eeaefeefd9dcdb06977920eca5d941 +refs/heads/master: bcc70a64a443ec19f84bb0dc3268d2c95b52e209 diff --git a/trunk/drivers/staging/gma500/psb_powermgmt.c b/trunk/drivers/staging/gma500/psb_powermgmt.c index f837ab0608ce..2253ecbfd61c 100644 --- a/trunk/drivers/staging/gma500/psb_powermgmt.c +++ b/trunk/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 */