aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorRodrigo Vivi <rodrigo.vivi@intel.com>2015-03-24 15:40:09 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-03-26 08:04:23 -0400
commitab585dea120fa20313b1b5a3be2b3d614f094678 (patch)
tree9e8db33c943ae3e39be7f33294947604314211eb /drivers/gpu/drm/i915/intel_display.c
parent6c826f349587f6c897da9bd224912ca1aee3d9ea (diff)
drm/i915: kill i915.powersave
This flag was being mostly used as a meta flag in some cases and not covering other cases. One of the risks is that it was masking some frontbuffer trackings without disabling PSR. So, better to kill this at once and avoid umbrella parameters. Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Acked-by: Chris Wilson <chris@chris-wilson.co.uk> [danvet: Drop unused out: label to appease gcc.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f9dc5babcf27..d98df2739666 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6024,7 +6024,7 @@ static void i9xx_update_pll_dividers(struct intel_crtc *crtc,
6024 6024
6025 crtc->lowfreq_avail = false; 6025 crtc->lowfreq_avail = false;
6026 if (intel_pipe_will_have_type(crtc, INTEL_OUTPUT_LVDS) && 6026 if (intel_pipe_will_have_type(crtc, INTEL_OUTPUT_LVDS) &&
6027 reduced_clock && i915.powersave) { 6027 reduced_clock) {
6028 crtc_state->dpll_hw_state.fp1 = fp2; 6028 crtc_state->dpll_hw_state.fp1 = fp2;
6029 crtc->lowfreq_avail = true; 6029 crtc->lowfreq_avail = true;
6030 } else { 6030 } else {
@@ -7807,7 +7807,7 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,
7807 } 7807 }
7808 } 7808 }
7809 7809
7810 if (is_lvds && has_reduced_clock && i915.powersave) 7810 if (is_lvds && has_reduced_clock)
7811 crtc->lowfreq_avail = true; 7811 crtc->lowfreq_avail = true;
7812 else 7812 else
7813 crtc->lowfreq_avail = false; 7813 crtc->lowfreq_avail = false;
@@ -9322,9 +9322,6 @@ void intel_mark_idle(struct drm_device *dev)
9322 9322
9323 dev_priv->mm.busy = false; 9323 dev_priv->mm.busy = false;
9324 9324
9325 if (!i915.powersave)
9326 goto out;
9327
9328 for_each_crtc(dev, crtc) { 9325 for_each_crtc(dev, crtc) {
9329 if (!crtc->primary->fb) 9326 if (!crtc->primary->fb)
9330 continue; 9327 continue;
@@ -9335,7 +9332,6 @@ void intel_mark_idle(struct drm_device *dev)
9335 if (INTEL_INFO(dev)->gen >= 6) 9332 if (INTEL_INFO(dev)->gen >= 6)
9336 gen6_rps_idle(dev->dev_private); 9333 gen6_rps_idle(dev->dev_private);
9337 9334
9338out:
9339 intel_runtime_pm_put(dev_priv); 9335 intel_runtime_pm_put(dev_priv);
9340} 9336}
9341 9337