Attachment 110163 Details for Bug 86697 – [PATCH] drm/i915: Don't frob Gunit registers on CHV

[patch] [PATCH] drm/i915: Don't frob Gunit registers on CHV

0001-drm-i915-Don-t-frob-Gunit-registers-on-CHV.patch (text/plain), 1.45 KB, created by Ville Syrjala on 2014-11-28 14:18:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Syrjala

Created: 2014-11-28 14:18:54 UTC

Size: 1.45 KB

patch

obsolete

>From 31c848147033654f7470daef255d749ae124afd2 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
>Date: Fri, 28 Nov 2014 16:15:48 +0200
>Subject: [PATCH] drm/i915: Don't frob Gunit registers on CHV
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>CHV has some fancy new register save/restore engine that's supposed to
>make this unnecessary. Also some of those registers might be gen7
>specific.
>
>Signed-off-by: Ville SyrjÃ¤lÃ¤ <ville.syrjala@linux.intel.com>
>---
> drivers/gpu/drm/i915/i915_drv.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>index 1e9c136..333e4a8 100644
>--- a/drivers/gpu/drm/i915/i915_drv.c
>+++ b/drivers/gpu/drm/i915/i915_drv.c
>@@ -1296,7 +1296,8 @@ static int vlv_suspend_complete(struct drm_i915_private *dev_priv)
> 	err = vlv_allow_gt_wake(dev_priv, false);
> 	if (err)
> 		goto err2;
>-	vlv_save_gunit_s0ix_state(dev_priv);
>+	if (!IS_CHERRYVIEW(dev_priv))
>+		vlv_save_gunit_s0ix_state(dev_priv);
> 
> 	err = vlv_force_gfx_clock(dev_priv, false);
> 	if (err)
>@@ -1327,7 +1328,8 @@ static int vlv_resume_prepare(struct drm_i915_private *dev_priv,
> 	 */
> 	ret = vlv_force_gfx_clock(dev_priv, true);
> 
>-	vlv_restore_gunit_s0ix_state(dev_priv);
>+	if (!IS_CHERRYVIEW(dev_priv))
>+		vlv_restore_gunit_s0ix_state(dev_priv);
> 
> 	err = vlv_allow_gt_wake(dev_priv, true);
> 	if (!ret)
>-- 
>2.0.4
>

Actions: View | Splinter Review

Attachments on bug 86697: 109999 | 110000 | 110032 | 110033 | 110101 | 110102 | 110163 | 110293 | 110294 | 110337 | 110343 | 110344 | 110345 | 110346 | 111261

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.