drm/i915: Print RC6 info less often
Subsystems (2)
PATCH 1/1 drm/i915: Print RC6 info less often
Since we use intel_enable_rc6() now for more than just when we're enabling RC6, we'll see this message many times, and it is just confusing.
As an example, calc_residency calls this function whenever poked via sysfs. This leaves the impression in dmesg that we're constantly re-enabling RC6.
While at it, move the defines and description from drv.h to intel_pm.c, since these are only ever used in that code.
--- drivers/gpu/drm/i915/i915_drv.h | 21 ---------------- drivers/gpu/drm/i915/intel_pm.c | 54 ++++++++++++++++++++++++++++++++--------- 2 files changed, 43 insertions(+), 32 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -21
@@ -1786,27 +1786,6 @@ struct drm_i915_file_private {#include "i915_trace.h" -/** -* RC6 is a special power stage which allows the GPU to enter an very -* low-voltage mode when idle, using down to 0V while at this stage. This -* stage is entered automatically when the GPU is idle when RC6 support is -* enabled, and as soon as new workload arises GPU wakes up automatically as well. -* -* There are different RC6 modes available in Intel GPU, which differentiate -* among each other with the latency required to enter and leave RC6 and -* voltage consumed by the GPU in different states. -* -* The combination of the following flags define which states GPU is allowed -* to enter, while RC6 is the normal RC6 state, RC6p is the deep RC6, and -* RC6pp is deepest RC6. Their support by hardware varies according to the -* GPU, BIOS, chipset and platform. RC6 is usually the safest one and the one -* which brings the most power savings; deeper states save more power, but -* require higher latency to switch to and wake up. -*/ -#define INTEL_RC6_ENABLE (1<<0) -#define INTEL_RC6p_ENABLE (1<<1) -#define INTEL_RC6pp_ENABLE (1<<2) -extern const struct drm_ioctl_desc i915_ioctls[];extern int i915_max_ioctl;extern unsigned int i915_fbpercrtc__always_unused ;
drivers/gpu/drm/i915/intel_pm.c +43 -11
95 lines not on this page · raw message
Signature · 1 line
1.8.4
Quoted 3 lines · Ben Widawsky
Since we use
intel_enable_rc6()now for more than just when we're enabling RC6, we'll see this message many times, and it is just confusing.
I agree. Ok, had to double check that i915.i915_enable_rc6 was not writable at runtime, so it looks like the defaults are fixed and so it is not possible for intel_enable_rc6() to return different values over its lifetime.
Quoted 8 lines
As an example,
calc_residencycalls this function whenever poked via sysfs. This leaves the impression in dmesg that we're constantly re-enabling RC6.While at it, move the defines and description from
drv.htointel_pm.c, since these are only ever used in that code.Signed-off-by Ben Widawsky <[email protected]>
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Daniel Vetter
AppliedQuoted 14 lines · Chris Wilson
Quoted 3 lines · Ben Widawsky
Since we use
intel_enable_rc6()now for more than just when we're enabling RC6, we'll see this message many times, and it is just confusing.I agree. Ok, had to double check that i915.i915_enable_rc6 was not writable at runtime, so it looks like the defaults are fixed and so it is not possible for
intel_enable_rc6()to return different values over its lifetime.Quoted 4 lines
As an example,
calc_residencycalls this function whenever poked via sysfs. This leaves the impression in dmesg that we're constantly re-enabling RC6.
Quoted 5 lines
Quoted 4 lines
While at it, move the defines and description from
drv.htointel_pm.c, since these are only ever used in that code.Signed-off-by Ben Widawsky <[email protected]>Reviewed-by Chris Wilson <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch