From: Chris Wilson Date: Wed, 24 Aug 2016 09:27:01 +0000 (+0100) Subject: drm/i915: Force RC6 restore after system resume and reset X-Git-Tag: android-x86-7.1-r1~121^2~58^2~116 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=abc80abde5bd5962a4ec4e126ab7867c0b5fd195;p=android-x86%2Fkernel.git drm/i915: Force RC6 restore after system resume and reset In order for the RC6 autoenable worker to take any action, RC6 first must be disabled. Upon resume or reset, the sw state may be stale and so we require a forced restore. Fixes: b7137e0cf1e5 ("drm/i915: Defer enabling rc6 til after we submit...") Signed-off-by: Chris Wilson Cc: Mika Kuoppala Cc: Sagar Arun Kamble Link: http://patchwork.freedesktop.org/patch/msgid/20160824092701.19178-1-chris@chris-wilson.co.uk Reviewed-by: Mika Kuoppala --- diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 5a7c0c2e57d8..fc9273215286 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1560,6 +1560,7 @@ static int i915_drm_resume(struct drm_device *dev) int ret; disable_rpm_wakeref_asserts(dev_priv); + intel_sanitize_gt_powersave(dev_priv); ret = i915_ggtt_enable_hw(dev_priv); if (ret) @@ -1809,6 +1810,7 @@ int i915_reset(struct drm_i915_private *dev_priv) * previous concerns that it doesn't respond well to some forms * of re-init after reset. */ + intel_sanitize_gt_powersave(dev_priv); intel_autoenable_gt_powersave(dev_priv); return 0;