Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7df8721b authored by Jesse Barnes's avatar Jesse Barnes Committed by Keith Packard
Browse files

drm/i915: use i915_enable_rc6 on SNB too 



For debug & testing.

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 4a246cfc

drivers/gpu/drm/i915/intel_display.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -6959,7 +6959,7 @@ void gen6_enable_rps(struct drm_i915_private *dev_priv) 
{

{

	u32 rp_state_cap = I915_READ(GEN6_RP_STATE_CAP);

	u32 rp_state_cap = I915_READ(GEN6_RP_STATE_CAP);

	u32 gt_perf_status = I915_READ(GEN6_GT_PERF_STATUS);

	u32 gt_perf_status = I915_READ(GEN6_GT_PERF_STATUS);

	u32 pcu_mbox;

	u32 pcu_mbox, rc6_mask = 0;

	int cur_freq, min_freq, max_freq;

	int cur_freq, min_freq, max_freq;

	int i;

	int i;
@@ -6990,9 +6990,12 @@ void gen6_enable_rps(struct drm_i915_private *dev_priv) 
	I915_WRITE(GEN6_RC6p_THRESHOLD, 100000);

	I915_WRITE(GEN6_RC6p_THRESHOLD, 100000);

	I915_WRITE(GEN6_RC6pp_THRESHOLD, 64000); /* unused */

	I915_WRITE(GEN6_RC6pp_THRESHOLD, 64000); /* unused */





	if (i915_enable_rc6)

		rc6_mask = GEN6_RC_CTL_RC6p_ENABLE |

			GEN6_RC_CTL_RC6_ENABLE;



	I915_WRITE(GEN6_RC_CONTROL,

	I915_WRITE(GEN6_RC_CONTROL,

		   GEN6_RC_CTL_RC6p_ENABLE |

		   rc6_mask |

		   GEN6_RC_CTL_RC6_ENABLE |

		   GEN6_RC_CTL_EI_MODE(1) |

		   GEN6_RC_CTL_EI_MODE(1) |

		   GEN6_RC_CTL_HW_ENABLE);

		   GEN6_RC_CTL_HW_ENABLE);