From: Zhenyu Wang Subject: [PATCH 2/4] drm/i915: save/restore DSPARB only for chips before gen4 but not for G33 Date: Wed, 23 Mar 2011 10:21:07 +0800 Message-ID: <1300846869-28245-3-git-send-email-zhenyuw@linux.intel.com> References: <1300846869-28245-1-git-send-email-zhenyuw@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 0D2FA9EB11 for ; Tue, 22 Mar 2011 19:21:12 -0700 (PDT) In-Reply-To: <1300846869-28245-1-git-send-email-zhenyuw@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org DSPARB is reserved on G33 and not available on Gen6. Signed-off-by: Zhenyu Wang --- drivers/gpu/drm/i915/i915_suspend.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index 0521ecf..8d165c4 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c @@ -603,7 +603,8 @@ void i915_save_display(struct drm_device *dev) struct drm_i915_private *dev_priv = dev->dev_private; /* Display arbitration control */ - dev_priv->saveDSPARB = I915_READ(DSPARB); + if (dev_priv->info->gen < 4 && !IS_G33(dev)) + dev_priv->saveDSPARB = I915_READ(DSPARB); /* This is only meaningful in non-KMS mode */ /* Don't save them in KMS mode */ @@ -695,7 +696,8 @@ void i915_restore_display(struct drm_device *dev) struct drm_i915_private *dev_priv = dev->dev_private; /* Display arbitration */ - I915_WRITE(DSPARB, dev_priv->saveDSPARB); + if (dev_priv->info->gen < 4 && !IS_G33(dev)) + I915_WRITE(DSPARB, dev_priv->saveDSPARB); /* Display port ratios (must be done before clock is set) */ if (SUPPORTS_INTEGRATED_DP(dev)) { -- 1.7.4.1