drm/i915: Split VLV forcewake routines.
Subsystems (2)
v2 cover drm/i915: Split VLV forcewake routines.
From: Deepak S <[email protected]>
Valleyview has power wells MEDIA & RENDER and by spliting vlv force wake routines and individually controling Media/Render well, We have seen power savings in the lower sub-1W range on different workloads, e.g. glbenchmark, media playback
v2: Addressed review comments.
Deepak S (3):
drm/i915: Add power well arguments to force wake routines. drm/i915/vlv: Valleyview support for forcewake Individual power wells.
v2
drm/i915: Enabling DebugFS for valleyview forcewake counts. v2
drivers/gpu/drm/i915/i915_debugfs.c | 22 ++-- drivers/gpu/drm/i915/i915_drv.h | 32 ++++- drivers/gpu/drm/i915/i915_reg.h | 4 +- drivers/gpu/drm/i915/intel_display.c | 4 +- drivers/gpu/drm/i915/intel_pm.c | 22 ++-- drivers/gpu/drm/i915/intel_ringbuffer.c | 14 ++- drivers/gpu/drm/i915/intel_uncore.c | 217 +++++++++++++++++++++++++------- 7 files changed, 246 insertions(+), 69 deletions(-)
Signature · 1 line
1.8.4.2
PATCH v2 1/3 drm/i915: Add power well arguments to force wake routines.
From: Deepak S <[email protected]>
Added power well arguments to all the force wake routines to help us individually control power well based on the scenario.
--- drivers/gpu/drm/i915/i915_debugfs.c | 8 +++--- drivers/gpu/drm/i915/i915_drv.h | 15 ++++++++--- drivers/gpu/drm/i915/i915_reg.h | 4 +-- drivers/gpu/drm/i915/intel_display.c | 4 +-- drivers/gpu/drm/i915/intel_pm.c | 19 ++++++++------ drivers/gpu/drm/i915/intel_ringbuffer.c | 8 +++--- drivers/gpu/drm/i915/intel_uncore.c | 44 +++++++++++++++++++-------------- 7 files changed, 60 insertions(+), 42 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +4 -4
@@ -947,7 +947,7 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused)if (ret)return ret; -gen6_gt_force_wake_get (dev_priv); +gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); reqf =I915_READ (GEN6_RPNSWREQ ); reqf &= ~GEN6_TURBO_DISABLE ;
@@ -970,7 +970,7 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused) cagf = (rpstat &GEN6_CAGF_MASK ) >>GEN6_CAGF_SHIFT ; cagf *=GT_FREQUENCY_MULTIPLIER ; -gen6_gt_force_wake_put (dev_priv); +gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL );mutex_unlock (&dev->struct_mutex);seq_printf (m,"GT_PERF_STATUS: 0x%08x\n" , gt_perf_status);
@@ -2983,7 +2983,7 @@ static int i915_forcewake_open(struct inode *inode, struct file *file)if (INTEL_INFO (dev)->gen <6 )return 0 ; -gen6_gt_force_wake_get (dev_priv); +gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL );return 0 ; }
@@ -2996,7 +2996,7 @@ static int i915_forcewake_release(struct inode *inode, struct file *file)if (INTEL_INFO (dev)->gen <6 )return 0 ; -gen6_gt_force_wake_put (dev_priv); +gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL );return 0 ; }
drivers/gpu/drm/i915/i915_drv.h +11 -4
@@ -436,8 +436,10 @@ struct drm_i915_display_funcs { };struct intel_uncore_funcs { -void (*force_wake_get)(struct drm_i915_private *dev_priv); -void (*force_wake_put)(struct drm_i915_private *dev_priv); +void (*force_wake_get)(struct drm_i915_private *dev_priv, +int fw_engine); +void (*force_wake_put)(struct drm_i915_private *dev_priv, +int fw_engine);uint8_t (*mmio_readb)(struct drm_i915_private *dev_priv,off_t offset,bool trace);uint16_t (*mmio_readw)(struct drm_i915_private *dev_priv,off_t offset,bool trace);
@@ -2429,8 +2431,8 @@ extern void intel_display_print_error_state(struct drm_i915_error_state_buf *e,* must be set to prevent GT core from power down and stale values being * returned. */ -void gen6_gt_force_wake_get (struct drm_i915_private *dev_priv); -void gen6_gt_force_wake_put (struct drm_i915_private *dev_priv); +void gen6_gt_force_wake_get (struct drm_i915_private *dev_priv,int fw_engine); +void gen6_gt_force_wake_put (struct drm_i915_private *dev_priv,int fw_engine);int sandybridge_pcode_read (struct drm_i915_private *dev_priv,u8 mbox,u32 *val);int sandybridge_pcode_write (struct drm_i915_private *dev_priv,u8 mbox,u32 val);
@@ -2459,6 +2461,11 @@ void intel_sbi_write(struct drm_i915_private *dev_priv, u16 reg, u32 value,int vlv_gpu_freq (struct drm_i915_private *dev_priv,int val);int vlv_freq_opcode (struct drm_i915_private *dev_priv,int val); +#define FORCEWAKE_RENDER (1 << 0) +#define FORCEWAKE_MEDIA (1 << 1) +#define FORCEWAKE_ALL (FORCEWAKE_RENDER | FORCEWAKE_MEDIA) + +#define I915_READ8 (reg) dev_priv->uncore.funcs.mmio_readb(dev_priv, (reg), true)#define I915_WRITE8 (reg, val) dev_priv->uncore.funcs.mmio_writeb(dev_priv, (reg), (val), true)
drivers/gpu/drm/i915/i915_reg.h +2 -2
@@ -4840,8 +4840,8 @@#define EDP_LINK_TRAIN_VOL_EMP_MASK_IVB (0x3f<<22)#define FORCEWAKE 0xA18C -#define FORCEWAKE_VLV 0x1300b0 -#define FORCEWAKE_ACK_VLV 0x1300b4 +#define FORCEWAKE_VLV 0x1300b0 +#define FORCEWAKE_ACK_VLV 0x1300b4#define FORCEWAKE_MEDIA_VLV 0x1300b8#define FORCEWAKE_ACK_MEDIA_VLV 0x1300bc#define FORCEWAKE_ACK_HSW 0x130044
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -6578,7 +6578,7 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv)/* Make sure we're not on PC8 state before disabling PC8, otherwise * we'll hang the machine! */ - dev_priv->uncore.funcs.force_wake_get (dev_priv); + dev_priv->uncore.funcs.force_wake_get (dev_priv,FORCEWAKE_ALL );if (val &LCPLL_POWER_DOWN_ALLOW ) { val &= ~LCPLL_POWER_DOWN_ALLOW ;
@@ -6612,7 +6612,7 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv)DRM_ERROR ("Switching back to LCPLL failed\n" ); } - dev_priv->uncore.funcs.force_wake_put (dev_priv); + dev_priv->uncore.funcs.force_wake_put (dev_priv,FORCEWAKE_ALL ); }void hsw_enable_pc8_work (struct work_struct *__work)
drivers/gpu/drm/i915/intel_pm.c +11 -8
@@ -191,7 +191,8 @@ static void sandybridge_blit_fbc_update(struct drm_device *dev)u32 blt_ecoskpd;/* Make sure blitter notifies FBC of writes */ -gen6_gt_force_wake_get (dev_priv); +gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); + blt_ecoskpd =I915_READ (GEN6_BLITTER_ECOSKPD ); blt_ecoskpd |=GEN6_BLITTER_FBC_NOTIFY <<GEN6_BLITTER_LOCK_SHIFT ;
@@ -202,7 +203,8 @@ static void sandybridge_blit_fbc_update(struct drm_device *dev) GEN6_BLITTER_LOCK_SHIFT);I915_WRITE (GEN6_BLITTER_ECOSKPD , blt_ecoskpd);POSTING_READ (GEN6_BLITTER_ECOSKPD ); -gen6_gt_force_wake_put (dev_priv); + +gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); }static void ironlake_enable_fbc (struct drm_crtc *crtc,unsigned long interval)
@@ -3737,7 +3739,7 @@ static void gen8_enable_rps(struct drm_device *dev)/* 1c & 1d: Get forcewake during program sequence. Although the driver * hasn't enabled a state yet where we need forcewake, BIOS may have.*/ -gen6_gt_force_wake_get (dev_priv); +gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL );/* 2a: Disable RC states. */ I915_WRITE (GEN6_RC_CONTROL ,0 );
@@ -3794,7 +3796,7 @@ static void gen8_enable_rps(struct drm_device *dev)gen6_enable_rps_interrupts (dev); -gen6_gt_force_wake_put (dev_priv); +gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); }static void gen6_enable_rps (struct drm_device *dev)
@@ -3824,7 +3826,7 @@ static void gen6_enable_rps(struct drm_device *dev)I915_WRITE (GTFIFODBG , gtfifodbg); } -gen6_gt_force_wake_get (dev_priv); +gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); rp_state_cap =I915_READ (GEN6_RP_STATE_CAP ); gt_perf_status =I915_READ (GEN6_GT_PERF_STATUS );
@@ -3916,7 +3918,7 @@ static void gen6_enable_rps(struct drm_device *dev)DRM_ERROR ("Couldn't fix incorrect rc6 voltage\n" ); } -gen6_gt_force_wake_put (dev_priv); +gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); }void gen6_update_ring_freq (struct drm_device *dev)
@@ -4078,7 +4080,8 @@ static void valleyview_enable_rps(struct drm_device *dev)valleyview_setup_pctx (dev); -gen6_gt_force_wake_get (dev_priv); +/* If VLV, Forcewake all wells, else re-direct to regular path */ +gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL );I915_WRITE (GEN6_RP_UP_THRESHOLD ,59400 );I915_WRITE (GEN6_RP_DOWN_THRESHOLD ,245000 );
@@ -4150,7 +4153,7 @@ static void valleyview_enable_rps(struct drm_device *dev)gen6_enable_rps_interrupts (dev); -gen6_gt_force_wake_put (dev_priv); +gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); }void ironlake_teardown_rc6 (struct drm_device *dev)
drivers/gpu/drm/i915/intel_ringbuffer.c +4 -4
@@ -436,7 +436,7 @@ static int init_ring_common(struct intel_ring_buffer *ring)int ret =0 ;u32 head; -gen6_gt_force_wake_get (dev_priv); +gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL );if (I915_NEED_GFX_HWS (dev))intel_ring_setup_status_page (ring);
@@ -509,7 +509,7 @@ static int init_ring_common(struct intel_ring_buffer *ring)memset (&ring->hangcheck,0 ,sizeof (ring->hangcheck)); out: -gen6_gt_force_wake_put (dev_priv); +gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL );return ret; }
@@ -1033,7 +1033,7 @@ gen6_ring_get_irq(struct intel_ring_buffer *ring)/* It looks like we need to prevent the gt from suspending while waiting * for an notifiy irq, otherwise irqs seem to get lost on at least the * blt/bsd rings on ivb. */ -gen6_gt_force_wake_get (dev_priv); +gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL );spin_lock_irqsave (&dev_priv->irq_lock, flags);if (ring->irq_refcount++ ==0 ) {
@@ -1067,7 +1067,7 @@ gen6_ring_put_irq(struct intel_ring_buffer *ring) }spin_unlock_irqrestore (&dev_priv->irq_lock, flags); -gen6_gt_force_wake_put (dev_priv); +gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); } static bool
drivers/gpu/drm/i915/intel_uncore.c +26 -18
135 lines not on this page · raw message
Signature · 1 line
1.8.4.2
PATCH v2 2/3 drm/i915/vlv: Valleyview support for forcewake Individual power wells. v2
In reply to [email protected]From: Deepak S <[email protected]>
Split vlv force wake routines to help individually control Media/Render well based on the register access.
We've seen power savings in the lower sub-1W range on workloads that only need on of the power wells, e.g. glbenchmark, media playback
v2: Fix sparse warning 'Using plain integer as NULL pointer' (Build)
Fixed incorrectly sent forcewake param in vlv_read## (Deepak) Remove spurious hunk in i915_reg.h (Jesse)
--- drivers/gpu/drm/i915/i915_drv.h | 17 +++ drivers/gpu/drm/i915/intel_pm.c | 7 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 10 +- drivers/gpu/drm/i915/intel_uncore.c | 183 +++++++++++++++++++++++++++----- 4 files changed, 184 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +17 -0
@@ -464,6 +464,9 @@ struct intel_uncore {unsigned fifo_count;unsigned forcewake_count; +unsigned fw_rendercount; +unsigned fw_mediacount; +struct delayed_work force_wake_work; };
@@ -2461,6 +2464,20 @@ void intel_sbi_write(struct drm_i915_private *dev_priv, u16 reg, u32 value,int vlv_gpu_freq (struct drm_i915_private *dev_priv,int val);int vlv_freq_opcode (struct drm_i915_private *dev_priv,int val); +void vlv_force_wake_get (struct drm_i915_private *dev_priv,int fw_engine); +void vlv_force_wake_put (struct drm_i915_private *dev_priv,int fw_engine); + +#define FORCEWAKE_VLV_RENDER_RANGE_OFFSET (reg) \ + (((reg) >= 0x2000 && (reg) < 0x4000) ||\ + ((reg) >= 0x5000 && (reg) < 0x8000) ||\ + ((reg) >= 0xB000 && (reg) < 0x12000) ||\ + ((reg) >= 0x2E000 && (reg) < 0x30000)) + +#define FORCEWAKE_VLV_MEDIA_RANGE_OFFSET (reg)\ + (((reg) >= 0x12000 && (reg) < 0x14000) ||\ + ((reg) >= 0x22000 && (reg) < 0x24000) ||\ + ((reg) >= 0x30000 && (reg) < 0x40000)) +#define FORCEWAKE_RENDER (1 << 0)#define FORCEWAKE_MEDIA (1 << 1)#define FORCEWAKE_ALL (FORCEWAKE_RENDER | FORCEWAKE_MEDIA)
drivers/gpu/drm/i915/intel_pm.c +5 -2
@@ -191,7 +191,10 @@ static void sandybridge_blit_fbc_update(struct drm_device *dev)u32 blt_ecoskpd;/* Make sure blitter notifies FBC of writes */ -gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); + +/* Blitter is part of Media powerwell on VLV. No impact of +* his param in other platforms for now */ +gen6_gt_force_wake_get (dev_priv,FORCEWAKE_MEDIA ); blt_ecoskpd =I915_READ (GEN6_BLITTER_ECOSKPD ); blt_ecoskpd |= GEN6_BLITTER_FBC_NOTIFY <<
@@ -204,7 +207,7 @@ static void sandybridge_blit_fbc_update(struct drm_device *dev)I915_WRITE (GEN6_BLITTER_ECOSKPD , blt_ecoskpd);POSTING_READ (GEN6_BLITTER_ECOSKPD ); -gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); +gen6_gt_force_wake_put (dev_priv,FORCEWAKE_MEDIA ); }static void ironlake_enable_fbc (struct drm_crtc *crtc,unsigned long interval)
drivers/gpu/drm/i915/intel_ringbuffer.c +8 -2
@@ -1033,7 +1033,10 @@ gen6_ring_get_irq(struct intel_ring_buffer *ring)/* It looks like we need to prevent the gt from suspending while waiting * for an notifiy irq, otherwise irqs seem to get lost on at least the * blt/bsd rings on ivb. */ -gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); +if (ring->id ==RCS ) +gen6_gt_force_wake_get (dev_priv,FORCEWAKE_RENDER ); +else +gen6_gt_force_wake_get (dev_priv,FORCEWAKE_MEDIA );spin_lock_irqsave (&dev_priv->irq_lock, flags);if (ring->irq_refcount++ ==0 ) {
@@ -1067,7 +1070,10 @@ gen6_ring_put_irq(struct intel_ring_buffer *ring) }spin_unlock_irqrestore (&dev_priv->irq_lock, flags); -gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); +if (ring->id ==RCS ) +gen6_gt_force_wake_put (dev_priv,FORCEWAKE_RENDER ); +else +gen6_gt_force_wake_put (dev_priv,FORCEWAKE_MEDIA ); } static bool
drivers/gpu/drm/i915/intel_uncore.c +154 -29
234 lines not on this page · raw message
Signature · 1 line
1.8.4.2
PATCH v2 3/3 drm/i915: Enabling DebugFS for valleyview forcewake counts. v2
In reply to [email protected]From: Deepak S <[email protected]>
Forcewake counts for valleyview are not exposed throgh DebugFS. Exposing with this change.
v2: Separate spurious warning fix from this patch. (Jesse/Daniel)
--- drivers/gpu/drm/i915/i915_debugfs.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +11 -3
@@ -1564,13 +1564,21 @@ static int i915_gen6_forcewake_count_info(struct seq_file *m, void *data)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; -unsigned forcewake_count; +unsigned forcewake_count =0 , fw_rendercount =0 , fw_mediacount =0 ;spin_lock_irq (&dev_priv->uncore.lock); - forcewake_count = dev_priv->uncore.forcewake_count; +if (IS_VALLEYVIEW (dev)) { + fw_rendercount = dev_priv->uncore.fw_rendercount; + fw_mediacount = dev_priv->uncore.fw_mediacount; + }else + forcewake_count = dev_priv->uncore.forcewake_count;spin_unlock_irq (&dev_priv->uncore.lock); -seq_printf (m,"forcewake count = %u\n" , forcewake_count); +if (IS_VALLEYVIEW (dev)) { +seq_printf (m,"fw_rendercount = %u\n" , fw_rendercount); +seq_printf (m,"fw_mediacount = %u\n" , fw_mediacount); + }else +seq_printf (m,"forcewake count = %u\n" , forcewake_count);return 0 ; }
Signature · 1 line
1.8.4.2
Quoted 8 lines · On Thu, Nov 28, 2013 at 09:20:40AM +0530, [email protected] wrote:
From: Deepak S <[email protected]>
Valleyview has power wells MEDIA & RENDER and by spliting vlv force wake routines and individually controling Media/Render well, We have seen power savings in the lower sub-1W range on different workloads, e.g. glbenchmark, media playback
v2: Addressed review comments.
I've alredy pulled it all in and fixed things up while applying ;-) And iirc this is v3 of this series if we count the not-split patch as v1. Please double-check that I didn't miss anything in latest -nightly. -Daniel
Quoted 23 lines
Deepak S (3):
drm/i915: Add power well arguments to force wake routines. drm/i915/vlv: Valleyview support for forcewake Individual power wells.v2drm/i915: Enabling DebugFS for valleyview forcewake counts. v2
drivers/gpu/drm/i915/i915_debugfs.c | 22 ++-- drivers/gpu/drm/i915/i915_drv.h | 32 ++++- drivers/gpu/drm/i915/i915_reg.h | 4 +- drivers/gpu/drm/i915/intel_display.c | 4 +- drivers/gpu/drm/i915/intel_pm.c | 22 ++-- drivers/gpu/drm/i915/intel_ringbuffer.c | 14 ++- drivers/gpu/drm/i915/intel_uncore.c | 217 +++++++++++++++++++++++++------- 7 files changed, 246 insertions(+), 69 deletions(-)Signature · 6 lines
1.8.4.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
Yup, your right it should be version 3, my mistake I missed it while updating.
Just verified the patches in nightly branch, All the changes are present.
-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Thursday, November 28, 2013 1:06 PM
To: S, Deepak
Cc: [email protected]
Subject: Re: [Intel-gfx] [PATCH v2 0/3] drm/i915: Split VLV forcewake routines.
Quoted 8 lines · On Thu, Nov 28, 2013 at 09:20:40AM +0530, [email protected] wrote:
From: Deepak S <[email protected]>
Valleyview has power wells MEDIA & RENDER and by spliting vlv force wake routines and individually controling Media/Render well, We have seen power savings in the lower sub-1W range on different workloads, e.g. glbenchmark, media playback
v2: Addressed review comments.
I've alredy pulled it all in and fixed things up while applying ;-) And iirc this is v3 of this series if we count the not-split patch as v1. Please double-check that I didn't miss anything in latest -nightly.
-Daniel
Quoted 16 lines
Deepak S (3):
drm/i915: Add power well arguments to force wake routines. drm/i915/vlv: Valleyview support for forcewake Individual power wells.v2drm/i915: Enabling DebugFS for valleyview forcewake counts. v2
drivers/gpu/drm/i915/i915_debugfs.c | 22 ++-- drivers/gpu/drm/i915/i915_drv.h | 32 ++++- drivers/gpu/drm/i915/i915_reg.h | 4 +- drivers/gpu/drm/i915/intel_display.c | 4 +- drivers/gpu/drm/i915/intel_pm.c | 22 ++-- drivers/gpu/drm/i915/intel_ringbuffer.c | 14 ++- drivers/gpu/drm/i915/intel_uncore.c | 217 +++++++++++++++++++++++++------- 7 files changed, 246 insertions(+), 69 deletions(-)
Quoted 7 lines
--
1.8.4.2_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch