[CI] drm/i915: Don't fiddle with rps/rc6 across GPU reset

Commit Message

Chris Wilson April 10, 2018, 1:33 p.m. UTC

Resetting the GPU doesn't affect the RPS/RC6 state, so we can stop
forcibly reloading the registers.

Ville suggested this many moons ago, I said at that time that sanitizing
was no harm and meant that our bookkeeping was kept consistent with the
HW. However, in a forthcoming series, we want to split rps/rc6 GT
powermanagement and one of the key simplifications is the control of
when we enable it. Performing a crude sanitize in the middle of
i915_gem_reset() is then a huge wart.

Suggested-by: Ville Syrjälä <[e-mail]>
Signed-off-by: Chris Wilson <[e-mail]>
Cc: Ville Syrjälä <[e-mail]>
Reviewed-by: Sagar Arun Kamble <[e-mail]>
---
 drivers/gpu/drm/i915/i915_gem.c | 7 -------
 1 file changed, 7 deletions(-)

Comments

Chris Wilson April 10, 2018, 4:13 p.m. UTC | #1

Quoting Patchwork (2018-04-10 16:46:06)
> == Series Details ==
> 
> Series: drm/i915: Don't fiddle with rps/rc6 across GPU reset
> URL   : https://patchwork.freedesktop.org/series/41474/
> State : warning
> 
> == Summary ==
> 
> = CI Bug Log - changes from CI_DRM_4040_full -> Patchwork_8657_full =
> 
> == Summary - WARNING ==
> 
>   Minor unknown changes coming with Patchwork_8657_full need to be verified
>   manually.
>   
>   If you think the reported changes have nothing to do with the changes
>   introduced in Patchwork_8657_full, please notify your bug team to allow them
>   to document this new failure mode, which will reduce the CI noise.
> 
>   External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8657/
> 
> == Possible new issues ==
> 
>   Here are the unknown changes that may have been introduced in Patchwork_8657_full:
> 
>   === IGT changes ===
> 
>     ==== Warnings ====
> 
>     igt@perf_pmu@rc6:
>       shard-kbl:          SKIP -> PASS
> 
>     
> == Known issues ==
> 
>   Here are the changes found in Patchwork_8657_full that come from known issues:
> 
>   === IGT changes ===
> 
>     ==== Possible fixes ====
> 
>     igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:
>       shard-hsw:          FAIL (fdo#104873) -> PASS
> 
>     igt@kms_flip@flip-vs-expired-vblank-interruptible:
>       shard-hsw:          FAIL (fdo#105189) -> PASS
> 
>     
>   fdo#104873 https://bugs.freedesktop.org/show_bug.cgi?id=104873
>   fdo#105189 https://bugs.freedesktop.org/show_bug.cgi?id=105189
> 
> 
> == Participating hosts (6 -> 4) ==
> 
>   Missing    (2): shard-glk shard-glkb 

Even without glk, looks like rps across reset was not affected. \o/
-Chris

Patch

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 28ab0beff86c..60cf7cfc24ee 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3254,13 +3254,6 @@  void i915_gem_reset(struct drm_i915_private *dev_priv,
 	}
 
 	i915_gem_restore_fences(dev_priv);
-
-	if (dev_priv->gt.awake) {
-		intel_sanitize_gt_powersave(dev_priv);
-		intel_enable_gt_powersave(dev_priv);
-		if (INTEL_GEN(dev_priv) >= 6)
-			gen6_rps_busy(dev_priv);
-	}
 }
 
 void i915_gem_reset_finish_engine(struct intel_engine_cs *engine)