* [PATCH] drm/i915: kill i915.powersave
@ 2015-03-24 19:40 Rodrigo Vivi
2015-03-24 20:50 ` Chris Wilson
2015-03-25 1:20 ` shuang.he
0 siblings, 2 replies; 6+ messages in thread
From: Rodrigo Vivi @ 2015-03-24 19:40 UTC (permalink / raw)
To: intel-gfx; +Cc: 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.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
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(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index f4adca1..92a9e85 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -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;
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 7106633..db79da6 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -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 "
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 91dd7bf..180b42a 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -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;
diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c
index 9fcf446..4165ce0 100644
--- a/drivers/gpu/drm/i915/intel_fbc.c
+++ b/drivers/gpu/drm/i915/intel_fbc.c
@@ -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;
diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.c b/drivers/gpu/drm/i915/intel_frontbuffer.c
index 8d4d710..57095f5 100644
--- a/drivers/gpu/drm/i915/intel_frontbuffer.c
+++ b/drivers/gpu/drm/i915/intel_frontbuffer.c
@@ -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;
--
2.1.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] drm/i915: kill i915.powersave
2015-03-24 19:40 [PATCH] drm/i915: kill i915.powersave Rodrigo Vivi
@ 2015-03-24 20:50 ` Chris Wilson
2015-03-25 13:45 ` Daniel Vetter
2015-03-25 1:20 ` shuang.he
1 sibling, 1 reply; 6+ messages in thread
From: Chris Wilson @ 2015-03-24 20:50 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
On Tue, Mar 24, 2015 at 12:40:09PM -0700, Rodrigo Vivi wrote:
> 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>
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.
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: kill i915.powersave
2015-03-24 20:50 ` Chris Wilson
@ 2015-03-25 13:45 ` Daniel Vetter
2015-03-26 11:31 ` Tvrtko Ursulin
0 siblings, 1 reply; 6+ messages in thread
From: Daniel Vetter @ 2015-03-25 13:45 UTC (permalink / raw)
To: Chris Wilson, Rodrigo Vivi, intel-gfx
On Tue, Mar 24, 2015 at 08:50:34PM +0000, Chris Wilson wrote:
> On Tue, Mar 24, 2015 at 12:40:09PM -0700, Rodrigo Vivi wrote:
> > 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>
>
> 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.
>
> Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Queued for -next, thanks for the patch.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: kill i915.powersave
2015-03-25 13:45 ` Daniel Vetter
@ 2015-03-26 11:31 ` Tvrtko Ursulin
2015-03-26 12:26 ` Daniel Vetter
0 siblings, 1 reply; 6+ messages in thread
From: Tvrtko Ursulin @ 2015-03-26 11:31 UTC (permalink / raw)
To: Daniel Vetter, Chris Wilson, Rodrigo Vivi, intel-gfx
On 03/25/2015 01:45 PM, Daniel Vetter wrote:
> On Tue, Mar 24, 2015 at 08:50:34PM +0000, Chris Wilson wrote:
>> On Tue, Mar 24, 2015 at 12:40:09PM -0700, Rodrigo Vivi wrote:
>>> 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>
>>
>> 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.
>>
>> Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
>
> 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
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: kill i915.powersave
2015-03-26 11:31 ` Tvrtko Ursulin
@ 2015-03-26 12:26 ` Daniel Vetter
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Vetter @ 2015-03-26 12:26 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx, Rodrigo Vivi
On Thu, Mar 26, 2015 at 11:31:35AM +0000, Tvrtko Ursulin wrote:
>
> On 03/25/2015 01:45 PM, Daniel Vetter wrote:
> >On Tue, Mar 24, 2015 at 08:50:34PM +0000, Chris Wilson wrote:
> >>On Tue, Mar 24, 2015 at 12:40:09PM -0700, Rodrigo Vivi wrote:
> >>>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>
> >>
> >>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.
> >>
> >>Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
> >
> >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
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: kill i915.powersave
2015-03-24 19:40 [PATCH] drm/i915: kill i915.powersave Rodrigo Vivi
2015-03-24 20:50 ` Chris Wilson
@ 2015-03-25 1:20 ` shuang.he
1 sibling, 0 replies; 6+ messages in thread
From: shuang.he @ 2015-03-25 1:20 UTC (permalink / raw)
To: shuang.he, ethan.gao, intel-gfx, rodrigo.vivi
Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
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
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-03-26 12:25 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-24 19:40 [PATCH] drm/i915: kill i915.powersave Rodrigo Vivi
2015-03-24 20:50 ` Chris Wilson
2015-03-25 13:45 ` Daniel Vetter
2015-03-26 11:31 ` Tvrtko Ursulin
2015-03-26 12:26 ` Daniel Vetter
2015-03-25 1:20 ` shuang.he
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.