From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754038Ab1GEOr5 (ORCPT ); Tue, 5 Jul 2011 10:47:57 -0400 Received: from lxorguk.ukuu.org.uk ([81.2.110.251]:59114 "EHLO lxorguk.ukuu.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753148Ab1GEOr4 (ORCPT ); Tue, 5 Jul 2011 10:47:56 -0400 From: Alan Cox Subject: [PATCH 19/49] gma500: Only fiddle with clock gating on PSB To: greg@kroah.com, linux-kernel@vger.kernel.org Date: Tue, 05 Jul 2011 15:38:11 +0100 Message-ID: <20110705143805.23872.21824.stgit@localhost.localdomain> In-Reply-To: <20110705141038.23872.55303.stgit@localhost.localdomain> References: <20110705141038.23872.55303.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alan Cox Signed-off-by: Alan Cox --- drivers/staging/gma500/psb_powermgmt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/staging/gma500/psb_powermgmt.c b/drivers/staging/gma500/psb_powermgmt.c index f837ab0..2253ecb 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 */