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

Message ID 20191212000727.672044-1-chris@chris-wilson.co.uk
State New
Headers show
  • drm/i915/gt: Only ignore rc6 parking for PCU on byt/bsw
Related show

Commit Message

Chris Wilson Dec. 12, 2019, 12:07 a.m. UTC
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 check.

Fixes: 972745fd5770 ("drm/i915/gt: Disable manual rc6 for Braswell/Baytrail")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
 drivers/gpu/drm/i915/gt/intel_rc6.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

diff --git a/drivers/gpu/drm/i915/gt/intel_rc6.c b/drivers/gpu/drm/i915/gt/intel_rc6.c
index 8ec2b7725141..64174b2cbada 100644
--- a/drivers/gpu/drm/i915/gt/intel_rc6.c
+++ b/drivers/gpu/drm/i915/gt/intel_rc6.c
@@ -612,7 +612,7 @@  void intel_rc6_park(struct intel_rc6 *rc6)
-	if (!(rc6->ctl_enable & GEN6_RC_CTL_RC6_ENABLE))
+	if (IS_CHERRYVIEW(rc6_to_i915(rc6)) || IS_VALLEYVIEW(rc6_to_i915(rc6)))
 	/* Turn off the HW timers and go directly to rc6 */