From patchwork Mon Mar 21 09:27:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhenyu Wang X-Patchwork-Id: 647431 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2L9UeoK021313 for ; Mon, 21 Mar 2011 09:31:00 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C64149E943 for ; Mon, 21 Mar 2011 02:30:39 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 654C59E937 for ; Mon, 21 Mar 2011 02:27:25 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 21 Mar 2011 02:27:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.63,218,1299484800"; d="scan'208";a="669413541" Received: from ubuntu-hp.sh.intel.com ([10.239.36.56]) by fmsmga002.fm.intel.com with ESMTP; 21 Mar 2011 02:27:24 -0700 From: Zhenyu Wang To: intel-gfx@lists.freedesktop.org Date: Mon, 21 Mar 2011 17:27:18 +0800 Message-Id: <1300699639-23996-8-git-send-email-zhenyuw@linux.intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1300699639-23996-1-git-send-email-zhenyuw@linux.intel.com> References: <1300699639-23996-1-git-send-email-zhenyuw@linux.intel.com> Subject: [Intel-gfx] [PATCH 7/8] drm/i915: move sandybridge RC6 enable in resume after ring initialization X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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.6 (demeter1.kernel.org [140.211.167.41]); Mon, 21 Mar 2011 09:31:00 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index a55b71d..b40f3ee 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -384,6 +384,10 @@ static int i915_drm_thaw(struct drm_device *dev) if (IS_IRONLAKE_M(dev)) ironlake_enable_rc6(dev); + + if (IS_GEN6(dev)) + gen6_enable_rps(dev_priv); + } intel_opregion_init(dev); diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index 26387c3..8e6aa8c 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c @@ -862,9 +862,6 @@ int i915_restore_state(struct drm_device *dev) intel_init_emon(dev); } - if (IS_GEN6(dev)) - gen6_enable_rps(dev_priv); - /* Memory arbitration state */ if (IS_GEN3(dev)) I915_WRITE (MI_ARB_STATE, dev_priv->saveMI_ARB_STATE | 0xffff0000);