drm/i915: re-enable rc6 support for Ironlake
Subsystems (2)
PATCH 1/1 drm/i915: re-enable rc6 support for Ironlake
Re-enable rc6 support on Ironlake for power savings. Adds a debugfs file to check current RC state, adds a missing workaround for Ironlake MI_SET_CONTEXT instructions, and renames MCHBAR_RENDER_STANDBY to RSTDBYCTL to match the docs.
Signed-off-by Jesse Barnes <[email protected]>
--- drivers/gpu/drm/i915/i915_debugfs.c | 26 +++++++++++++++++- drivers/gpu/drm/i915/i915_reg.h | 50 +++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/i915_suspend.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 29 +++++++++----------- 4 files changed, 87 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +25 -1
@@ -890,7 +890,7 @@ static int i915_drpc_info(struct seq_file *m, void *unused)struct drm_device *dev = node->minor->dev;drm_i915_private_t *dev_priv = dev->dev_private;u32 rgvmodectl =I915_READ (MEMMODECTL ); -u32 rstdbyctl =I915_READ (MCHBAR_RENDER_STANDBY ); +u32 rstdbyctl =I915_READ (RSTDBYCTL );u16 crstandvid =I915_READ16 (CRSTANDVID ); seq_printf(m, "HD boost: %s\n", (rgvmodectl & MEMMODE_BOOST_EN) ?
@@ -913,6 +913,30 @@ static int i915_drpc_info(struct seq_file *m, void *unused)seq_printf (m,"RS2 VID: %d\n" , ((crstandvid >>8 ) &0x3f ));seq_printf (m,"Render standby enabled: %s\n" , (rstdbyctl &RCX_SW_EXIT ) ?"no" :"yes" ); +seq_printf (m,"Current RS state: " ); +switch (rstdbyctl &RSX_STATUS_MASK ) { +case RSX_STATUS_ON : +seq_printf (m,"on\n" ); +break ; +case RSX_STATUS_RC1 : +seq_printf (m,"RC1\n" ); +break ; +case RSX_STATUS_RC1E : +seq_printf (m,"RC1E\n" ); +break ; +case RSX_STATUS_RS1 : +seq_printf (m,"RS1\n" ); +break ; +case RSX_STATUS_RS2 : +seq_printf (m,"RS2 (RC6)\n" ); +break ; +case RSX_STATUS_RS3 : +seq_printf (m,"RC3 (RC6+)\n" ); +break ; +default : +seq_printf (m,"unknown\n" ); +break ; + }return 0 ; }
drivers/gpu/drm/i915/i915_reg.h +47 -3
68 lines not on this page · raw message
drivers/gpu/drm/i915/i915_suspend.c +2 -2
@@ -740,7 +740,7 @@ void i915_restore_display(struct drm_device *dev)I915_WRITE (PCH_PP_OFF_DELAYS , dev_priv->savePP_OFF_DELAYS);I915_WRITE (PCH_PP_DIVISOR , dev_priv->savePP_DIVISOR);I915_WRITE (PCH_PP_CONTROL , dev_priv->savePP_CONTROL); -I915_WRITE (MCHBAR_RENDER_STANDBY , +I915_WRITE (RSTDBYCTL , dev_priv->saveMCHBAR_RENDER_STANDBY); }else {I915_WRITE (PFIT_PGM_RATIOS , dev_priv->savePFIT_PGM_RATIOS);
@@ -811,7 +811,7 @@ int i915_save_state(struct drm_device *dev) dev_priv->saveFDI_RXA_IMR =I915_READ (FDI_RXA_IMR ); dev_priv->saveFDI_RXB_IMR =I915_READ (FDI_RXB_IMR ); dev_priv->saveMCHBAR_RENDER_STANDBY = -I915_READ (MCHBAR_RENDER_STANDBY ); +I915_READ (RSTDBYCTL ); }else { dev_priv->saveIER =I915_READ (IER ); dev_priv->saveIMR =I915_READ (IMR );
drivers/gpu/drm/i915/intel_display.c +13 -16
@@ -6372,35 +6372,32 @@ void intel_enable_clock_gating(struct drm_device *dev)* GPU can automatically power down the render unit if given a page * to save state. */ -if (IS_IRONLAKE_M (dev) &&0 ) {/* XXX causes a failure during suspend */ +if ((IS_GEN4 (dev) ||IS_GEN5 (dev)) &&IS_MOBILE (dev)) {if (dev_priv->renderctx ==NULL ) dev_priv->renderctx =intel_alloc_context_page (dev);if (dev_priv->renderctx) {struct drm_i915_gem_object *obj = dev_priv->renderctx; -if (BEGIN_LP_RING (4 ) ==0 ) { -OUT_RING (MI_SET_CONTEXT ); -OUT_RING (obj->gtt_offset | -MI_MM_SPACE_GTT | -MI_SAVE_EXT_STATE_EN | -MI_RESTORE_EXT_STATE_EN | -MI_RESTORE_INHIBIT ); -OUT_RING (MI_NOOP ); -OUT_RING (MI_FLUSH ); -ADVANCE_LP_RING (); - } +BEGIN_LP_RING (6 ); +OUT_RING (MI_SUSPEND_FLUSH |MI_SUSPEND_FLUSH_EN ); +OUT_RING (MI_SET_CONTEXT ); +OUT_RING (obj->gtt_offset | +MI_MM_SPACE_GTT | +MI_SAVE_EXT_STATE_EN | +MI_RESTORE_EXT_STATE_EN | +MI_RESTORE_INHIBIT ); +OUT_RING (MI_SUSPEND_FLUSH ); +OUT_RING (MI_NOOP ); +OUT_RING (MI_FLUSH ); +ADVANCE_LP_RING (); }else DRM_DEBUG_KMS ("Failed to allocate render context." "Disable RC6\n" ); - } -if (IS_GEN4 (dev) &&IS_MOBILE (dev)) {if (dev_priv->pwrctx ==NULL ) dev_priv->pwrctx =intel_alloc_context_page (dev);if (dev_priv->pwrctx) {struct drm_i915_gem_object *obj = dev_priv->pwrctx;I915_WRITE (PWRCTXA , obj->gtt_offset |PWRCTX_EN ); -I915_WRITE (MCHBAR_RENDER_STANDBY , -I915_READ (MCHBAR_RENDER_STANDBY ) & ~RCX_SW_EXIT ); } } }
Signature · 1 line
1.7.0.4
Quoted 4 lines · On Thu, 23 Dec 2010 09:22:16 -0800 Jesse Barnes <[email protected]>…
Re-enable rc6 support on Ironlake for power savings. Adds a debugfs file to check current RC state, adds a missing workaround for Ironlake
MI_SET_CONTEXTinstructions, and renamesMCHBAR_RENDER_STANDBYto RSTDBYCTL to match the docs.
Updated patch to fix suspend/resume is on its way. We were trying to emit ring commands before the ring had been initialized.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center