Commit 7d929989 authored by Chris Wilson's avatar Chris Wilson

drm/i915/gt: Only ignore rc6 parking for PCU on byt/bsw

An oversight in that we use rc6->ctl_enable to disable rc6 on gen9 and
so it does not simply indicate indirect control via a PCU. Switch the
rc6->ctl_enable check for a platform-based check.

Fixes: 972745fd ("drm/i915/gt: Disable manual rc6 for Braswell/Baytrail")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarAndi Shyti <andi.shyti@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191212072737.884335-2-chris@chris-wilson.co.uk
parent 6aacb5a3
...@@ -576,6 +576,7 @@ void intel_rc6_enable(struct intel_rc6 *rc6) ...@@ -576,6 +576,7 @@ void intel_rc6_enable(struct intel_rc6 *rc6)
else if (INTEL_GEN(i915) >= 6) else if (INTEL_GEN(i915) >= 6)
gen6_rc6_enable(rc6); gen6_rc6_enable(rc6);
rc6->manual = rc6->ctl_enable & GEN6_RC_CTL_RC6_ENABLE;
if (NEEDS_RC6_CTX_CORRUPTION_WA(i915)) if (NEEDS_RC6_CTX_CORRUPTION_WA(i915))
rc6->ctl_enable = 0; rc6->ctl_enable = 0;
...@@ -612,7 +613,7 @@ void intel_rc6_park(struct intel_rc6 *rc6) ...@@ -612,7 +613,7 @@ void intel_rc6_park(struct intel_rc6 *rc6)
return; return;
} }
if (!(rc6->ctl_enable & GEN6_RC_CTL_RC6_ENABLE)) if (!rc6->manual)
return; return;
/* Turn off the HW timers and go directly to rc6 */ /* Turn off the HW timers and go directly to rc6 */
......
...@@ -24,6 +24,7 @@ struct intel_rc6 { ...@@ -24,6 +24,7 @@ struct intel_rc6 {
bool supported : 1; bool supported : 1;
bool enabled : 1; bool enabled : 1;
bool manual : 1;
bool wakeref : 1; bool wakeref : 1;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment