drm/i915: implement IPS feature
Subsystems (2)
PATCH 1/3 drm/i915: implement IPS feature
From: Paulo Zanoni <[email protected]>
Intermediate Pixel Storage is a feature that should reduce the number of times the display engine wakes up memory to read pixels, so it should allow deeper PC states. IPS can only be enabled on ULT pipe A with 8:8:8 pipe pixel formats.
With eDP 1920x1080 and correct watermarks but without FBC this moves my PC7 residency from 2.5% to around 38%.
v2: - It's tied to pipe A, not port A
- Add pipe_config support (Chris)
- Add some assertions (Chris)
- Rebase against latest dinq
v3: - Don't ever set ips_enabled to false (Daniel)
- Only check for ips_enabled at hsw_disable_ips (Daniel)
v4: - Add hsw_compute_ips_config (Daniel)
- Use the new dump_pipe_config (Daniel)
--- drivers/gpu/drm/i915/i915_reg.h | 11 +++++ drivers/gpu/drm/i915/intel_display.c | 78 ++++++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_drv.h | 2 + 3 files changed, 88 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +11 -0
@@ -1020,6 +1020,8 @@/* Framebuffer compression for Ivybridge */ #define IVB_FBC_RT_BASE 0x7020 +#define IPS_CTL 0x43408 +#define IPS_ENABLE (1 << 31)#define _HSW_PIPE_SLICE_CHICKEN_1_A 0x420B0#define _HSW_PIPE_SLICE_CHICKEN_1_B 0x420B4
@@ -3663,6 +3665,15 @@#define _LGC_PALETTE_B 0x4a800#define LGC_PALETTE (pipe) _PIPE(pipe, _LGC_PALETTE_A, _LGC_PALETTE_B) +#define _GAMMA_MODE_A 0x4a480 +#define _GAMMA_MODE_B 0x4ac80 +#define GAMMA_MODE (pipe) _PIPE(pipe, _GAMMA_MODE_A, _GAMMA_MODE_B) +#define GAMMA_MODE_MODE_MASK (3 << 0) +#define GAMMA_MODE_MODE_8bit (0 << 0) +#define GAMMA_MODE_MODE_10bit (1 << 0) +#define GAMMA_MODE_MODE_12bit (2 << 0) +#define GAMMA_MODE_MODE_SPLIT (3 << 0) +/* interrupts */ #define DE_MASTER_IRQ_CONTROL (1 << 31)#define DE_SPRITEB_FLIP_DONE (1 << 29)
drivers/gpu/drm/i915/intel_display.c +75 -3
151 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -268,6 +268,8 @@ struct intel_crtc_config {/* FDI configuration, only valid if has_pch_encoder is set. */ int fdi_lanes;struct intel_link_m_n fdi_m_n; + +bool ips_enabled; };struct intel_crtc {
Signature · 1 line
1.8.1.2
PATCH 2/3 drm/i915: add enable_ips module option
From: Paulo Zanoni <[email protected]>
IPS is still enabled by default. Feature requested by the power management team.
This should also help testing the feature on some early pre-production hardware where there were relationship problems between IPS and PSR.
v2: Rebase on top of the newest IPS implementation.
v3: Check i915_enable_ips at compute_config, not supports_ips, so the
kernel parameter will be ignored at haswell_get_pipe_config.
--- drivers/gpu/drm/i915/i915_drv.c | 4 ++++ drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_display.c | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.c +4 -0
@@ -128,6 +128,10 @@ module_param_named(disable_power_well, i915_disable_power_well, int, 0600);MODULE_PARM_DESC (disable_power_well,"Disable the power well when possible (default: false)" ); +int i915_enable_ips__read_mostly =1 ; +module_param_named (enable_ips, i915_enable_ips, int,0600 ); +MODULE_PARM_DESC (enable_ips,"Enable IPS (default: true)" ); +static struct drm_driver driver;extern int intel_agp_enabled;
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -1470,6 +1470,7 @@ extern bool i915_enable_hangcheck __read_mostly;extern int i915_enable_ppgtt__read_mostly ;extern unsigned int i915_preliminary_hw_support__read_mostly ;extern int i915_disable_power_well__read_mostly ; +extern int i915_enable_ips__read_mostly ;extern int i915_suspend (struct drm_device *dev,pm_message_t state);extern int i915_resume (struct drm_device *dev);
drivers/gpu/drm/i915/intel_display.c +2 -1
@@ -4039,7 +4039,8 @@ retry:static void hsw_compute_ips_config (struct intel_crtc *crtc,struct intel_crtc_config *pipe_config) { - pipe_config->ips_enabled =hsw_crtc_supports_ips (crtc) && + pipe_config->ips_enabled = i915_enable_ips && +hsw_crtc_supports_ips (crtc) && pipe_config->pipe_bpp ==24 ; }
Signature · 1 line
1.8.1.2
PATCH 3/3 drm/i915: add i915_ips_status debugfs entry
In reply to Paulo ZanoniFrom: Paulo Zanoni <[email protected]>
It just prints whether it's supported/enabled/disabled. Feature requested by the power management team.
v2: Checkpatch started complaining about seq_printf with 1 argument.
--- drivers/gpu/drm/i915/i915_debugfs.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +20 -0
@@ -1434,6 +1434,25 @@ static int i915_fbc_status(struct seq_file *m, void *unused)return 0 ; } +static int i915_ips_status (struct seq_file *m,void *unused) +{ +struct drm_info_node *node = (struct drm_info_node *) m->private; +struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv = dev->dev_private; + +if (!IS_ULT (dev)) { +seq_puts (m,"not supported\n" ); +return 0 ; + } + +if (I915_READ (IPS_CTL ) &IPS_ENABLE ) +seq_puts (m,"enabled\n" ); +else +seq_puts (m,"disabled\n" ); + +return 0 ; +} +static int i915_sr_status (struct seq_file *m,void *unused) {struct drm_info_node *node = (struct drm_info_node *) m->private;
@@ -2231,6 +2250,7 @@ static struct drm_info_list i915_debugfs_list[] = { {"i915_ring_freq_table", i915_ring_freq_table, 0}, {"i915_gfxec", i915_gfxec, 0}, {"i915_fbc_status", i915_fbc_status, 0}, + {"i915_ips_status", i915_ips_status, 0}, {"i915_sr_status", i915_sr_status, 0}, {"i915_opregion", i915_opregion, 0}, {"i915_gem_framebuffer", i915_gem_framebuffer_info, 0},
Signature · 1 line
1.8.1.2
Re: [PATCH 3/3] drm/i915: add i915_ips_status debugfs entry
Quoted 9 lines · Paulo Zanoni
From: Paulo Zanoni <[email protected]>
It just prints whether it's supported/enabled/disabled. Feature requested by the power management team.
v2: Checkpatch started complaining about
seq_printfwith 1 argument.Requested-by Kristen Accardi <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>
All three merged into dinq, thanks.
-Daniel
Quoted 49 lines
--- drivers/gpu/drm/i915/i915_debugfs.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)drivers/gpu/drm/i915/i915_debugfs.c +20
-0@@ -1434,6 +1434,25 @@ static int i915_fbc_status(struct seq_file *m, void *unused)return 0 ; } +static int i915_ips_status (struct seq_file *m,void *unused) +{ +struct drm_info_node *node = (struct drm_info_node *) m->private; +struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv = dev->dev_private; + +if (!IS_ULT (dev)) { +seq_puts (m,"not supported\n" ); +return 0 ; + } + +if (I915_READ (IPS_CTL ) &IPS_ENABLE ) +seq_puts (m,"enabled\n" ); +else +seq_puts (m,"disabled\n" ); + +return 0 ; +} +static int i915_sr_status (struct seq_file *m,void *unused) {struct drm_info_node *node = (struct drm_info_node *) m->private;@@ -2231,6 +2250,7 @@ static struct drm_info_list i915_debugfs_list[] = { {"i915_ring_freq_table", i915_ring_freq_table, 0}, {"i915_gfxec", i915_gfxec, 0}, {"i915_fbc_status", i915_fbc_status, 0}, + {"i915_ips_status", i915_ips_status, 0}, {"i915_sr_status", i915_sr_status, 0}, {"i915_opregion", i915_opregion, 0}, {"i915_gem_framebuffer", i915_gem_framebuffer_info, 0},Signature · 6 lines
1.8.1.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch