]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915: Wait thread status on gen8+ fw sequence
authorMika Kuoppala <mika.kuoppala@linux.intel.com>
Mon, 10 Nov 2014 12:52:50 +0000 (04:52 -0800)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 14 Nov 2014 09:29:26 +0000 (10:29 +0100)
As per latest pm guide, we need to do this also on
past hsw.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_uncore.c

index 6a0c3fb2cbf0f5102b79184bb91db320c8246d73..86a755a9b9d0d867a18a260514293fd8cadaebf0 100644 (file)
@@ -120,8 +120,7 @@ static void __gen7_gt_force_wake_mt_get(struct drm_i915_private *dev_priv,
                DRM_ERROR("Timed out waiting for forcewake to ack request.\n");
 
        /* WaRsForcewakeWaitTC0:ivb,hsw */
-       if (INTEL_INFO(dev_priv->dev)->gen < 8)
-               __gen6_gt_wait_for_thread_c0(dev_priv);
+       __gen6_gt_wait_for_thread_c0(dev_priv);
 }
 
 static void gen6_gt_check_fifodbg(struct drm_i915_private *dev_priv)