drm/i915: render p-state support for Sandybridge
Subsystems (2)
PATCH 1/1 drm/i915: render p-state support for Sandybridge
Note: this patch is just for comments/testing, it should not be integrated at this time.
This seems to be enough to initialize render p-state support and get up/down interrupts (though I've only confirmed down interrupts so far). There's code in there for requesting a frequency change, but it seems to be ignored (at least according to GT_PERF_STATUS; the debugfs file never indicates that a frequency change has occurred).
Still working with the hw guys on resolving that, but I thought I'd post this for reference so that others with Sandybridge systems could try it out and report their results.
Thanks,
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
drivers/gpu/drm/i915/i915_debugfs.c +36 -9
@@ -658,15 +658,42 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused)struct drm_info_node *node = (struct drm_info_node *) m->private;struct drm_device *dev = node->minor->dev;drm_i915_private_t *dev_priv = dev->dev_private; -u16 rgvswctl =I915_READ16 (MEMSWCTL ); -u16 rgvstat =I915_READ16 (MEMSTAT_ILK ); - -seq_printf (m,"Requested P-state: %d\n" , (rgvswctl >>8 ) &0xf ); -seq_printf (m,"Requested VID: %d\n" , rgvswctl &0x3f ); -seq_printf (m,"Current VID: %d\n" , (rgvstat &MEMSTAT_VID_MASK ) >> -MEMSTAT_VID_SHIFT ); -seq_printf (m,"Current P-state: %d\n" , - (rgvstat &MEMSTAT_PSTATE_MASK ) >>MEMSTAT_PSTATE_SHIFT ); + +if (IS_GEN5 (dev)) { +u16 rgvswctl =I915_READ16 (MEMSWCTL ); +u16 rgvstat =I915_READ16 (MEMSTAT_ILK ); + +seq_printf (m,"Requested P-state: %d\n" , (rgvswctl >>8 ) &0xf ); +seq_printf (m,"Requested VID: %d\n" , rgvswctl &0x3f ); +seq_printf (m,"Current VID: %d\n" , (rgvstat &MEMSTAT_VID_MASK ) >> +MEMSTAT_VID_SHIFT ); +seq_printf (m,"Current P-state: %d\n" , + (rgvstat &MEMSTAT_PSTATE_MASK ) >>MEMSTAT_PSTATE_SHIFT ); + }else if (IS_GEN6 (dev)) { +u32 gt_perf_status =I915_READ (0x145948 ); +u32 rp_state_limits =I915_READ (0x145994 ); +u32 rp_state_cap =I915_READ (0x145998 ); +int max_freq; + +seq_printf (m,"GT_PERF_STATUS: 0x%08x\n" , gt_perf_status); +seq_printf (m,"Render p-state ratio: %d\n" , + (gt_perf_status &0xff00 ) >>8 ); +seq_printf (m,"Render p-state VID: %d\n" , + gt_perf_status &0xff ); +seq_printf (m,"Render p-state limit: %d\n" , + rp_state_limits &0xff ); + + max_freq = (rp_state_cap &0xff0000 ) >>16 ; +seq_printf (m,"Max RPN frequency: %dMHz\n" , max_freq *100 ); + + max_freq = (rp_state_cap &0xff00 ) >>8 ; +seq_printf (m,"Max RP1 frequency: %dMHz\n" , max_freq *100 ); + + max_freq = rp_state_cap &0xff ; +seq_printf (m,"Max RP0 frequency: %dMHz\n" , max_freq *100 ); + }else { +seq_printf (m,"no P-state info available\n" ); + }return 0 ; }
drivers/gpu/drm/i915/i915_drv.c +1 -0
@@ -509,6 +509,7 @@ i915_pci_remove(struct pci_dev *pdev)struct drm_device *dev =pci_get_drvdata (pdev);drm_put_dev (dev); +pci_disable_device (pdev); }static int i915_pm_suspend (struct device *dev)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -186,6 +186,7 @@ struct drm_i915_display_funcs {void (*update_wm)(struct drm_device *dev,int planea_clock,int planeb_clock,int sr_hdisplay,int sr_htotal,int pixel_size); +void (*handle_rps_change)(struct drm_device *dev);/* clock updates for mode set */ /* cursor updates */ /* render clock increase/decrease */
@@ -1161,6 +1162,7 @@ extern void intel_disable_fbc(struct drm_device *dev);extern void intel_enable_fbc (struct drm_crtc *crtc,unsigned long interval);extern bool intel_fbc_enabled (struct drm_device *dev);extern bool ironlake_set_drps (struct drm_device *dev,u8 val); +extern void sandybridge_set_drps (struct drm_device *dev,u8 val);extern void intel_detect_pch (struct drm_device *dev);extern int intel_trans_dp_port_sel (struct drm_crtc *crtc);
drivers/gpu/drm/i915/i915_irq.c +35 -0
@@ -306,6 +306,38 @@ static void notify_ring(struct drm_device *dev, jiffies + msecs_to_jiffies(DRM_I915_HANGCHECK_PERIOD)); } +static void sandybridge_pm_irq_handler (struct drm_device *dev) +{ +drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; +u8 new_delay = dev_priv->cur_delay; +u32 pm_iir; + + pm_iir =I915_READ (PMIIR ); +if (!pm_iir) +return ; + +DRM_ERROR ("received PM interrupt: 0x%08x\n" , pm_iir); +DRM_ERROR (" ISR: 0x%08x, IMR: 0x%08x, IER: 0x%08x\n" , +I915_READ (PMISR ),I915_READ (PMIMR ),I915_READ (PMIER )); + +if (pm_iir &PM_RP_UP ) { +if (dev_priv->cur_delay != dev_priv->max_delay) + new_delay = dev_priv->cur_delay +1 ; +if (new_delay > dev_priv->max_delay) + new_delay = dev_priv->max_delay; + }else if (pm_iir &PM_RP_DOWN ) { +if (dev_priv->cur_delay != dev_priv->min_delay) + new_delay = dev_priv->cur_delay -1 ; +if (new_delay < dev_priv->min_delay) + new_delay = dev_priv->min_delay; + } + +sandybridge_set_drps (dev, new_delay); + dev_priv->cur_delay = new_delay; + +I915_WRITE (PMIIR , pm_iir); +} +static irqreturn_t ironlake_irq_handler (struct drm_device *dev) {drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -379,6 +411,9 @@ static irqreturn_t ironlake_irq_handler(struct drm_device *dev)i915_handle_rps_change (dev); } +if (IS_GEN6 (dev)) +sandybridge_pm_irq_handler (dev); +/* should clear PCH hotplug event before clear CPU irq */ I915_WRITE (SDEIIR , pch_iir);I915_WRITE (GTIIR , gt_iir);
drivers/gpu/drm/i915/i915_reg.h +50 -0
62 lines not on this page · raw message
drivers/gpu/drm/i915/i915_suspend.c +7 -2
@@ -771,8 +771,10 @@ int i915_save_state(struct drm_device *dev) dev_priv->saveIMR =I915_READ (IMR ); } -if (HAS_PCH_SPLIT (dev)) +if (IS_IRONLAKE_M (dev))ironlake_disable_drps (dev); +if (IS_GEN6 (dev)) +sandybridge_disable_drps (dev);/* Cache mode state */ dev_priv->saveCACHE_MODE_0 =I915_READ (CACHE_MODE_0 );
@@ -862,11 +864,14 @@ int i915_restore_state(struct drm_device *dev)/* Clock gating state */ intel_init_clock_gating (dev); -if (HAS_PCH_SPLIT (dev)) { +if (IS_IRONLAKE_M (dev)) {ironlake_enable_drps (dev);intel_init_emon (dev); } +if (IS_GEN6 (dev)) +sandybridge_enable_drps (dev); +/* Cache mode state */ I915_WRITE (CACHE_MODE_0 , dev_priv->saveCACHE_MODE_0 |0xffff0000 );
drivers/gpu/drm/i915/intel_display.c +91 -0
109 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -296,6 +296,8 @@ extern void intel_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,extern void intel_init_clock_gating (struct drm_device *dev);extern void ironlake_enable_drps (struct drm_device *dev);extern void ironlake_disable_drps (struct drm_device *dev); +extern void sandybridge_enable_drps (struct drm_device *dev); +extern void sandybridge_disable_drps (struct drm_device *dev);extern void intel_init_emon (struct drm_device *dev); extern int intel_pin_and_fence_fb_obj(struct drm_device *dev,
Quoted 2 lines · Jesse Barnes
Note: this patch is just for comments/testing, it should not be integrated at this time.
So that's what drps stands for: dynamic render P-states! Jesse, at the very least shouldn't we apply the s/HAS_PCH_SPLIT/IS_GEN5/ in order not to be poking gen5 registers on gen6?
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Quoted 8 lines · On Fri, 10 Dec 2010 09:37:00 +0000 Chris Wilson <[email protected]>…
Quoted 2 lines · Jesse Barnes
Note: this patch is just for comments/testing, it should not be integrated at this time.
So that's what drps stands for: dynamic render P-states! Jesse, at the very least shouldn't we apply the s/HAS_PCH_SPLIT/IS_GEN5/ in order not to be poking gen5 registers on gen6?
-Chris
Or add an IS_IRONLAKE macro; that's what I was really looking for. Will fix.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center