From patchwork Fri Jun 25 05:40:22 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: "Zou, Nanhai" <nanhai.zou@intel.com>
X-Patchwork-Id: 107992
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5P5fcJQ031951
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Fri, 25 Jun 2010 05:42:14 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id 5DB0E9EB4E
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Thu, 24 Jun 2010 22:41:38 -0700 (PDT)
X-Original-To: intel-gfx@lists.freedesktop.org
Delivered-To: intel-gfx@lists.freedesktop.org
Received: from mga01.intel.com (mga01.intel.com [192.55.52.88])
	by gabe.freedesktop.org (Postfix) with ESMTP id F3C459E791
	for <intel-gfx@lists.freedesktop.org>;
	Thu, 24 Jun 2010 22:40:28 -0700 (PDT)
Received: from fmsmga001.fm.intel.com ([10.253.24.23])
	by fmsmga101.fm.intel.com with ESMTP; 24 Jun 2010 22:39:54 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="4.53,479,1272870000"; d="scan'208";a="811457704"
Received: from unknown (HELO hdmi.sh.intel.com) ([10.239.36.58])
	by fmsmga001.fm.intel.com with ESMTP; 24 Jun 2010 22:40:25 -0700
From: Zou Nan hai <nanhai.zou@intel.com>
To: Anholt@freedesktop.org, Eric <eric.anholt@intel.com>,
	intel-gfx <intel-gfx@lists.freedesktop.org>
Date: Fri, 25 Jun 2010 13:40:22 +0800
Message-Id: <1277444424-5766-2-git-send-email-nanhai.zou@intel.com>
X-Mailer: git-send-email 1.7.1
In-Reply-To: <1277444424-5766-1-git-send-email-nanhai.zou@intel.com>
References: <1277444424-5766-1-git-send-email-nanhai.zou@intel.com>
Subject: [Intel-gfx] [PATCH 1/3] drm/i915 save power context on ironlake
X-BeenThere: intel-gfx@lists.freedesktop.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: Intel graphics driver community testing & development
	<intel-gfx.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
MIME-Version: 1.0
Sender: 
 intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org
Errors-To: 
 intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Fri, 25 Jun 2010 05:42:14 +0000 (UTC)


diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 88a1ab7..c3c9feb 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5299,7 +5299,8 @@ void intel_init_clock_gating(struct drm_device *dev)
 					(I915_READ(DISP_ARB_CTL) |
 						DISP_FBC_WM_DIS));
 		}
-		return;
+		if (IS_GEN6(dev))
+			return;
 	} else if (IS_G4X(dev)) {
 		uint32_t dspclk_gate;
 		I915_WRITE(RENCLK_GATE_D1, 0);