Commit ab585dea authored by Rodrigo Vivi's avatar Rodrigo Vivi Committed by Daniel Vetter

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: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
[danvet: Drop unused out: label to appease gcc.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 6c826f34
...@@ -2443,7 +2443,6 @@ extern int i915_resume_legacy(struct drm_device *dev); ...@@ -2443,7 +2443,6 @@ extern int i915_resume_legacy(struct drm_device *dev);
struct i915_params { struct i915_params {
int modeset; int modeset;
int panel_ignore_lid; int panel_ignore_lid;
unsigned int powersave;
int semaphores; int semaphores;
unsigned int lvds_downclock; unsigned int lvds_downclock;
int lvds_channel_mode; int lvds_channel_mode;
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
struct i915_params i915 __read_mostly = { struct i915_params i915 __read_mostly = {
.modeset = -1, .modeset = -1,
.panel_ignore_lid = 1, .panel_ignore_lid = 1,
.powersave = 1,
.semaphores = -1, .semaphores = -1,
.lvds_downclock = 0, .lvds_downclock = 0,
.lvds_channel_mode = 0, .lvds_channel_mode = 0,
...@@ -65,10 +64,6 @@ MODULE_PARM_DESC(panel_ignore_lid, ...@@ -65,10 +64,6 @@ MODULE_PARM_DESC(panel_ignore_lid,
"Override lid status (0=autodetect, 1=autodetect disabled [default], " "Override lid status (0=autodetect, 1=autodetect disabled [default], "
"-1=force lid closed, -2=force lid open)"); "-1=force lid closed, -2=force lid open)");
module_param_named(powersave, i915.powersave, int, 0600);
MODULE_PARM_DESC(powersave,
"Enable powersavings, fbc, downclocking, etc. (default: true)");
module_param_named_unsafe(semaphores, i915.semaphores, int, 0400); module_param_named_unsafe(semaphores, i915.semaphores, int, 0400);
MODULE_PARM_DESC(semaphores, MODULE_PARM_DESC(semaphores,
"Use semaphores for inter-ring sync " "Use semaphores for inter-ring sync "
......
...@@ -6024,7 +6024,7 @@ static void i9xx_update_pll_dividers(struct intel_crtc *crtc, ...@@ -6024,7 +6024,7 @@ static void i9xx_update_pll_dividers(struct intel_crtc *crtc,
crtc->lowfreq_avail = false; crtc->lowfreq_avail = false;
if (intel_pipe_will_have_type(crtc, INTEL_OUTPUT_LVDS) && if (intel_pipe_will_have_type(crtc, INTEL_OUTPUT_LVDS) &&
reduced_clock && i915.powersave) { reduced_clock) {
crtc_state->dpll_hw_state.fp1 = fp2; crtc_state->dpll_hw_state.fp1 = fp2;
crtc->lowfreq_avail = true; crtc->lowfreq_avail = true;
} else { } else {
...@@ -7807,7 +7807,7 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc, ...@@ -7807,7 +7807,7 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,
} }
} }
if (is_lvds && has_reduced_clock && i915.powersave) if (is_lvds && has_reduced_clock)
crtc->lowfreq_avail = true; crtc->lowfreq_avail = true;
else else
crtc->lowfreq_avail = false; crtc->lowfreq_avail = false;
...@@ -9322,9 +9322,6 @@ void intel_mark_idle(struct drm_device *dev) ...@@ -9322,9 +9322,6 @@ void intel_mark_idle(struct drm_device *dev)
dev_priv->mm.busy = false; dev_priv->mm.busy = false;
if (!i915.powersave)
goto out;
for_each_crtc(dev, crtc) { for_each_crtc(dev, crtc) {
if (!crtc->primary->fb) if (!crtc->primary->fb)
continue; continue;
...@@ -9335,7 +9332,6 @@ void intel_mark_idle(struct drm_device *dev) ...@@ -9335,7 +9332,6 @@ void intel_mark_idle(struct drm_device *dev)
if (INTEL_INFO(dev)->gen >= 6) if (INTEL_INFO(dev)->gen >= 6)
gen6_rps_idle(dev->dev_private); gen6_rps_idle(dev->dev_private);
out:
intel_runtime_pm_put(dev_priv); intel_runtime_pm_put(dev_priv);
} }
......
...@@ -521,7 +521,7 @@ void intel_fbc_update(struct drm_device *dev) ...@@ -521,7 +521,7 @@ void intel_fbc_update(struct drm_device *dev)
goto out_disable; goto out_disable;
} }
if (!i915.enable_fbc || !i915.powersave) { if (!i915.enable_fbc) {
if (set_no_fbc_reason(dev_priv, FBC_MODULE_PARAM)) if (set_no_fbc_reason(dev_priv, FBC_MODULE_PARAM))
DRM_DEBUG_KMS("fbc disabled per module param\n"); DRM_DEBUG_KMS("fbc disabled per module param\n");
goto out_disable; goto out_disable;
......
...@@ -110,9 +110,6 @@ static void intel_mark_fb_busy(struct drm_device *dev, ...@@ -110,9 +110,6 @@ static void intel_mark_fb_busy(struct drm_device *dev,
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
enum pipe pipe; enum pipe pipe;
if (!i915.powersave)
return;
for_each_pipe(dev_priv, pipe) { for_each_pipe(dev_priv, pipe) {
if (!(frontbuffer_bits & INTEL_FRONTBUFFER_ALL_MASK(pipe))) if (!(frontbuffer_bits & INTEL_FRONTBUFFER_ALL_MASK(pipe)))
continue; continue;
......
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