From patchwork Wed Mar 23 02:21:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhenyu Wang X-Patchwork-Id: 654111 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 p2N2NKDV020408 for ; Wed, 23 Mar 2011 02:23:40 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9B1029ED9D for ; Tue, 22 Mar 2011 19:23:20 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id B81289E971 for ; Tue, 22 Mar 2011 19:21:12 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 22 Mar 2011 19:21:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.63,228,1299484800"; d="scan'208";a="723168227" Received: from ubuntu-hp.sh.intel.com ([10.239.36.56]) by orsmga001.jf.intel.com with ESMTP; 22 Mar 2011 19:21:12 -0700 From: Zhenyu Wang To: intel-gfx@lists.freedesktop.org Date: Wed, 23 Mar 2011 10:21:08 +0800 Message-Id: <1300846869-28245-4-git-send-email-zhenyuw@linux.intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1300846869-28245-1-git-send-email-zhenyuw@linux.intel.com> References: <1300846869-28245-1-git-send-email-zhenyuw@linux.intel.com> Subject: [Intel-gfx] [PATCH 3/4] drm/i915: save/restore MI_ARB_STATE only before gen6 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]); Wed, 23 Mar 2011 02:23:45 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index 8d165c4..bce24d8 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c @@ -828,7 +828,8 @@ int i915_save_state(struct drm_device *dev) dev_priv->saveCACHE_MODE_0 = I915_READ(CACHE_MODE_0); /* Memory Arbitration state */ - dev_priv->saveMI_ARB_STATE = I915_READ(MI_ARB_STATE); + if (dev_priv->info->gen < 6) + dev_priv->saveMI_ARB_STATE = I915_READ(MI_ARB_STATE); /* Scratch space */ for (i = 0; i < 16; i++) { @@ -881,7 +882,8 @@ int i915_restore_state(struct drm_device *dev) I915_WRITE (CACHE_MODE_0, dev_priv->saveCACHE_MODE_0 | 0xffff0000); /* Memory arbitration state */ - I915_WRITE (MI_ARB_STATE, dev_priv->saveMI_ARB_STATE | 0xffff0000); + if (dev_priv->info->gen < 6) + I915_WRITE (MI_ARB_STATE, dev_priv->saveMI_ARB_STATE | 0xffff0000); for (i = 0; i < 16; i++) { I915_WRITE(SWF00 + (i << 2), dev_priv->saveSWF0[i]);