diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 5 | 
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 61fee7fcdc2..adca00783e6 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -2574,7 +2574,7 @@ static void gen6_enable_rps(struct drm_device *dev)  	I915_WRITE(GEN6_RC_SLEEP, 0);  	I915_WRITE(GEN6_RC1e_THRESHOLD, 1000);  	I915_WRITE(GEN6_RC6_THRESHOLD, 50000); -	I915_WRITE(GEN6_RC6p_THRESHOLD, 100000); +	I915_WRITE(GEN6_RC6p_THRESHOLD, 150000);  	I915_WRITE(GEN6_RC6pp_THRESHOLD, 64000); /* unused */  	/* Check if we are enabling RC6 */ @@ -4079,6 +4079,9 @@ void intel_set_power_well(struct drm_device *dev, bool enable)  	if (!IS_HASWELL(dev))  		return; +	if (!i915_disable_power_well && !enable) +		return; +  	tmp = I915_READ(HSW_PWR_WELL_DRIVER);  	is_enabled = tmp & HSW_PWR_WELL_STATE;  	enable_requested = tmp & HSW_PWR_WELL_ENABLE;  |