Skip to contentSkip to conversation

drm/i915: kill i915.powersave

PATCH Applied Rodrigo Vivi 5 participants 6 messages Mar 24, 2015 – Mar 26, 2015

Subsystems (2)
lore
Share & tools
lore

Rodrigo Vivi

author maintainer
#0 lore raw

PATCH 1/1 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.

---
 drivers/gpu/drm/i915/i915_drv.h          | 1 -
 drivers/gpu/drm/i915/i915_params.c       | 5 -----
 drivers/gpu/drm/i915/intel_display.c     | 7 ++-----
 drivers/gpu/drm/i915/intel_fbc.c         | 2 +-
 drivers/gpu/drm/i915/intel_frontbuffer.c | 3 ---
 5 files changed, 3 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -1
index f4adca1..92a9e85 100644
@@ -2440,7 +2440,6 @@ extern int i915_resume_legacy(struct drm_device *dev);
 struct i915_params {
 	int modeset;
 	int panel_ignore_lid;
-	unsigned int powersave;
 	int semaphores;
 	unsigned int lvds_downclock;
 	int lvds_channel_mode;
drivers/gpu/drm/i915/i915_params.c +0 -5
index 7106633..db79da6 100644
@@ -27,7 +27,6 @@
 struct i915_params i915 __read_mostly = {
 	.modeset = -1,
 	.panel_ignore_lid = 1,
-	.powersave = 1,
 	.semaphores = -1,
 	.lvds_downclock = 0,
 	.lvds_channel_mode = 0,
@@ -65,10 +64,6 @@ MODULE_PARM_DESC(panel_ignore_lid,
 	"Override lid status (0=autodetect, 1=autodetect disabled [default], "
 	"-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_PARM_DESC(semaphores,
 	"Use semaphores for inter-ring sync "
drivers/gpu/drm/i915/intel_display.c +2 -5
index 91dd7bf..180b42a 100644
@@ -6058,7 +6058,7 @@ static void i9xx_update_pll_dividers(struct intel_crtc *crtc,
 
 	crtc->lowfreq_avail = false;
 	if (intel_pipe_will_have_type(crtc, INTEL_OUTPUT_LVDS) &&
-	    reduced_clock && i915.powersave) {
+	    reduced_clock) {
 		crtc_state->dpll_hw_state.fp1 = fp2;
 		crtc->lowfreq_avail = true;
 	} else {
@@ -7841,7 +7841,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;
 	else
 		crtc->lowfreq_avail = false;
@@ -9356,9 +9356,6 @@ void intel_mark_idle(struct drm_device *dev)
 
 	dev_priv->mm.busy = false;
 
-	if (!i915.powersave)
-		goto out;
-
 	for_each_crtc(dev, crtc) {
 		if (!crtc->primary->fb)
 			continue;
drivers/gpu/drm/i915/intel_fbc.c +1 -1
index 9fcf446..4165ce0 100644
@@ -521,7 +521,7 @@ void intel_fbc_update(struct drm_device *dev)
 		goto out_disable;
 	}
 
-	if (!i915.enable_fbc || !i915.powersave) {
+	if (!i915.enable_fbc) {
 		if (set_no_fbc_reason(dev_priv, FBC_MODULE_PARAM))
 			DRM_DEBUG_KMS("fbc disabled per module param\n");
 		goto out_disable;
drivers/gpu/drm/i915/intel_frontbuffer.c +0 -3
index 8d4d710..57095f5 100644
@@ -110,9 +110,6 @@ static void intel_mark_fb_busy(struct drm_device *dev,
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	enum pipe pipe;
 
-	if (!i915.powersave)
-		return;
-
 	for_each_pipe(dev_priv, pipe) {
 		if (!(frontbuffer_bits & INTEL_FRONTBUFFER_ALL_MASK(pipe)))
 			continue;
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · Rodrigo Vivi

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.

Agreed. Its purpose was never entirely clear and its value in debugging was the same as using an elephant gun to shot at a gnat.

-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw
Quoted 7 lines · Chris Wilson
Quoted 6 lines · Rodrigo Vivi

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.

Quoted 8 lines
Quoted 3 lines

So, better to kill this at once and avoid umbrella parameters.

Agreed. Its purpose was never entirely clear and its value in debugging was the same as using an elephant gun to shot at a gnat.

Queued for -next, thanks for the patch.
-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw
Quoted 10 lines · Daniel Vetter
Quoted 9 lines · Chris Wilson
Quoted 8 lines · Rodrigo Vivi

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.

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

Agreed. Its purpose was never entirely clear and its value in debugging was the same as using an elephant gun to shot at a gnat.

Queued for -next, thanks for the patch.

There is an unused out label after this patch which causes a compiler warning. Would have sent a patch but I think you sometimes intervene manually in the tree for trivial things so did not bother.

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw
Quoted 17 lines · Tvrtko Ursulin
Quoted 15 lines · Daniel Vetter
Quoted 14 lines · Chris Wilson
Quoted 9 lines · Rodrigo Vivi

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.

Agreed. Its purpose was never entirely clear and its value in debugging was the same as using an elephant gun to shot at a gnat.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Queued for -next, thanks for the patch.

There is an unused out label after this patch which causes a compiler warning. Would have sent a patch but I think you sometimes intervene manually in the tree for trivial things so did not bother.

Already spotted and squashed away but not yet pushed out. -Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tested-by on v1 1/1
#5 lore raw
In reply to Rodrigo Vivi

Task id: 6044 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied

PNV                 -2              269/269              267/269
ILK                 -1              303/303              302/303
SNB                                  304/304              304/304
IVB                                  338/338              338/338
BYT                                  287/287              287/287
HSW                                  362/362              362/362
BDW                                  310/310              310/310
-------------------------------------Detailed-------------------------------------
Platform  Test                                drm-intel-nightly          Series Applied
*PNV  igt@gem_userptr_blits@minor-normal-sync      PASS(2)      DMESG_WARN(1)PASS(1)
 PNV  igt@gem_userptr_blits@minor-unsync-interruptible      DMESG_WARN(1)PASS(2)      DMESG_WARN(1)PASS(1)
*ILK  igt@gem_unfence_active_buffers      PASS(2)      DMESG_WARN(1)PASS(1)

Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx