drm/i915: Rebalance runtime pm vs forcewake
Subsystems (2)
PATCH 1/9 drm/i915: Rebalance runtime pm vs forcewake
From: Chris Wilson <[email protected]>
Calling intel_runtime_pm_put() is illegal from a soft-irq context, so revert the crude hack
commit aa0b3b5bb8768c1a6a6788869d9c7015eae7e80c
Author: Paulo Zanoni <[email protected]> Date: Tue Apr 1 14:55:07 2014 -0300
drm/i915: don't schedule force_wake_timer at gen6_read
and apply the single line corrective instead.
v2: assert forcewake is off after the forcewake_reset (Paulo)
References: https://bugs.freedesktop.org/show_bug.cgi?id=80913
--- drivers/gpu/drm/i915/i915_drv.c | 5 +++-- drivers/gpu/drm/i915/intel_uncore.c | 18 ++++++------------ 2 files changed, 9 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +3 -2
@@ -1365,8 +1365,6 @@ static int intel_runtime_suspend(struct device *device)if (WARN_ON_ONCE (!HAS_RUNTIME_PM (dev)))return -ENODEV ; -assert_force_wake_inactive (dev_priv); -DRM_DEBUG_KMS ("Suspending device\n" );/*
@@ -1405,6 +1403,7 @@ static int intel_runtime_suspend(struct device *device) }del_timer_sync (&dev_priv->gpu_error.hangcheck_timer); +intel_uncore_forcewake_reset (dev, false); dev_priv->pm.suspended = true;/*
@@ -1432,6 +1431,8 @@ static int intel_runtime_suspend(struct device *device)intel_opregion_notify_adapter (dev, PCI_D3hot); } +assert_force_wake_inactive (dev_priv); +DRM_DEBUG_KMS ("Device suspended\n" );return 0 ; }
drivers/gpu/drm/i915/intel_uncore.c +6 -12
@@ -449,8 +449,6 @@ static void gen6_force_wake_timer(unsigned long arg)if (--dev_priv->uncore.forcewake_count ==0 ) dev_priv->uncore.funcs.force_wake_put (dev_priv,FORCEWAKE_ALL );spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); - -intel_runtime_pm_put (dev_priv); }void intel_uncore_forcewake_reset (struct drm_device *dev,bool restore)
@@ -586,7 +584,6 @@ 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) {unsigned long irqflags; -bool delayed = false;if (!dev_priv->uncore.funcs.force_wake_put)return ;
@@ -603,21 +600,19 @@ void gen6_gt_force_wake_put(struct drm_i915_private *dev_priv, int fw_engine) goto out; } -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags);WARN_ON (!dev_priv->uncore.forcewake_count);if (--dev_priv->uncore.forcewake_count ==0 ) { dev_priv->uncore.forcewake_count++; - delayed = true;mod_timer_pinned (&dev_priv->uncore.force_wake_timer, jiffies +1 ); } +spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); out: -if (!delayed) -intel_runtime_pm_put (dev_priv); +intel_runtime_pm_put (dev_priv); }void assert_force_wake_inactive (struct drm_i915_private *dev_priv)
@@ -774,12 +769,11 @@ gen6_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \ NEEDS_FORCE_WAKE((dev_priv), (reg))) { \ dev_priv->uncore.funcs.force_wake_get (dev_priv, \FORCEWAKE_ALL ); \ - val = __raw_i915_read##x(dev_priv, reg); \ - dev_priv->uncore.funcs.force_wake_put(dev_priv, \ - FORCEWAKE_ALL); \ - } else { \ - val = __raw_i915_read##x(dev_priv, reg); \ + dev_priv->uncore.forcewake_count++; \ +mod_timer_pinned (&dev_priv->uncore.force_wake_timer, \ + jiffies +1 ); \ } \ + val = __raw_i915_read##x(dev_priv, reg); \ hsw_unclaimed_reg_debug(dev_priv, reg, true, false); \ REG_READ_FOOTER; \ }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/9 drm/i915: Assert that runtime pm is active on user fw access
From: Chris Wilson <[email protected]>
On user forcewake access, assert that runtime pm reference is held. Fix and cleanup the callsites accordingly.
v2: Remove intel_runtime_pm_get() rebasehap (Deepak)
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 + drivers/gpu/drm/i915/intel_display.c | 19 +-------- drivers/gpu/drm/i915/intel_lrc.c | 53 ++----------------------- drivers/gpu/drm/i915/intel_uncore.c | 76 +++++++++++------------------------- 4 files changed, 30 insertions(+), 120 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +2 -0
@@ -4335,6 +4335,7 @@ static int i915_forcewake_open(struct inode *inode, struct file *file)if (INTEL_INFO (dev)->gen <6 )return 0 ; +intel_runtime_pm_get (dev_priv);gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL );return 0 ;
@@ -4349,6 +4350,7 @@ static int i915_forcewake_release(struct inode *inode, struct file *file)return 0 ;gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); +intel_runtime_pm_put (dev_priv);return 0 ; }
drivers/gpu/drm/i915/intel_display.c +2 -17
@@ -7862,19 +7862,8 @@ 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. To prevent PC8 state, just enable force_wake. -* -* The other problem is that hsw_restore_lcpll() is called as part of -* the runtime PM resume sequence, so we can't just call -* gen6_gt_force_wake_get() because that function calls -* intel_runtime_pm_get(), and we can't change the runtime PM refcount -* while we are on the resume sequence. So to solve this problem we have -* to call special forcewake code that doesn't touch runtime PM and -* doesn't enable the forcewake delayed work. */ -spin_lock_irq (&dev_priv->uncore.lock); -if (dev_priv->uncore.forcewake_count++ ==0 ) - dev_priv->uncore.funcs.force_wake_get (dev_priv,FORCEWAKE_ALL ); -spin_unlock_irq (&dev_priv->uncore.lock); +gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL );if (val &LCPLL_POWER_DOWN_ALLOW ) { val &= ~LCPLL_POWER_DOWN_ALLOW ;
@@ -7904,11 +7893,7 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv)DRM_ERROR ("Switching back to LCPLL failed\n" ); } -/* See the big comment above. */ -spin_lock_irq (&dev_priv->uncore.lock); -if (--dev_priv->uncore.forcewake_count ==0 ) - dev_priv->uncore.funcs.force_wake_put (dev_priv,FORCEWAKE_ALL ); -spin_unlock_irq (&dev_priv->uncore.lock); +gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); }/*
drivers/gpu/drm/i915/intel_lrc.c +3 -50
73 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uncore.c +23 -53
148 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/9 drm/i915: Skip uncore lock on earlier gens
In reply to Mika KuoppalaFrom: Chris Wilson <[email protected]>
With gen < 6 we don't need to take uncore lock as we don't have anything to protect from concurrent access.
v2: rebase and account for gen9 changes
--- drivers/gpu/drm/i915/intel_uncore.c | 158 +++++++++++++++++++++--------------- 1 file changed, 91 insertions(+), 67 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +91 -67
@@ -702,38 +702,61 @@ hsw_unclaimed_reg_detect(struct drm_i915_private *dev_priv) } } -#define REG_READ_HEADER (x) \ - unsigned long irqflags; \ +#define GEN2_READ_HEADER (x) \ u##x val = 0; \ - assert_device_not_suspended(dev_priv); \ - spin_lock_irqsave(&dev_priv->uncore.lock, irqflags) + assert_device_not_suspended(dev_priv); -#define REG_READ_FOOTER \ - spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags); \ +#define GEN2_READ_FOOTER \ trace_i915_reg_rw(false, reg, val, sizeof(val), trace); \ return val -#define __gen4_read (x) \ +#define __gen2_read (x) \ static u##x \ -gen4_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \ - REG_READ_HEADER(x); \ +gen2_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \ + GEN2_READ_HEADER(x); \ val = __raw_i915_read##x(dev_priv, reg); \ - REG_READ_FOOTER; \ + GEN2_READ_FOOTER; \ }#define __gen5_read (x) \ static u##x \ gen5_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \ - REG_READ_HEADER(x); \ + GEN2_READ_HEADER(x); \ ilk_dummy_write(dev_priv); \ val = __raw_i915_read##x(dev_priv, reg); \ - REG_READ_FOOTER; \ + GEN2_READ_FOOTER; \ } +__gen5_read(8) +__gen5_read(16) +__gen5_read(32) +__gen5_read(64) +__gen2_read(8) +__gen2_read(16) +__gen2_read(32) +__gen2_read(64) + +#undef __gen5_read +#undef __gen2_read + +#undef GEN2_READ_FOOTER +#undef GEN2_READ_HEADER + +#define GEN6_READ_HEADER (x) \ + unsigned long irqflags; \ + u##x val = 0; \ + assert_device_not_suspended(dev_priv); \ + spin_lock_irqsave(&dev_priv->uncore.lock, irqflags) + +#define GEN6_READ_FOOTER \ + spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags); \ + trace_i915_reg_rw(false, reg, val, sizeof(val), trace); \ + return val +#define __gen6_read (x) \ static u##x \ gen6_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \ - REG_READ_HEADER(x); \ + GEN6_READ_HEADER(x); \ hsw_unclaimed_reg_debug(dev_priv, reg, true, true); \ if (dev_priv->uncore.forcewake_count == 0 && \ NEEDS_FORCE_WAKE((dev_priv), (reg))) { \
@@ -745,14 +768,14 @@ gen6_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \ } \ val = __raw_i915_read##x(dev_priv, reg); \ hsw_unclaimed_reg_debug(dev_priv, reg, true, false); \ - REG_READ_FOOTER; \ + GEN6_READ_FOOTER; \ }#define __vlv_read (x) \ static u##x \ vlv_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \ unsigned fwengine = 0; \ - REG_READ_HEADER(x); \ + GEN6_READ_HEADER(x); \ if (FORCEWAKE_VLV_RENDER_RANGE_OFFSET(reg)) { \ if (dev_priv->uncore.fw_rendercount == 0) \ fwengine = FORCEWAKE_RENDER; \
@@ -765,14 +788,14 @@ vlv_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \ val = __raw_i915_read##x(dev_priv, reg); \ if (fwengine) \ dev_priv->uncore.funcs.force_wake_put(dev_priv, fwengine); \ - REG_READ_FOOTER; \ + GEN6_READ_FOOTER; \ }#define __chv_read (x) \ static u##x \ chv_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \ unsigned fwengine = 0; \ - REG_READ_HEADER(x); \ + GEN6_READ_HEADER(x); \ if (FORCEWAKE_CHV_RENDER_RANGE_OFFSET(reg)) { \ if (dev_priv->uncore.fw_rendercount == 0) \ fwengine = FORCEWAKE_RENDER; \
@@ -790,7 +813,7 @@ chv_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \ val = __raw_i915_read##x(dev_priv, reg); \ if (fwengine) \ dev_priv->uncore.funcs.force_wake_put(dev_priv, fwengine); \ - REG_READ_FOOTER; \ + GEN6_READ_FOOTER; \ }#define SKL_NEEDS_FORCE_WAKE (dev_priv, reg) \
@@ -799,7 +822,7 @@ chv_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \#define __gen9_read (x) \ static u##x \ gen9_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \ - REG_READ_HEADER(x); \ + GEN6_READ_HEADER(x); \ if (!SKL_NEEDS_FORCE_WAKE((dev_priv), (reg))) { \ val = __raw_i915_read##x(dev_priv, reg); \ } else { \
@@ -825,7 +848,7 @@ gen9_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \if (fwengine) \ dev_priv->uncore.funcs.force_wake_put (dev_priv, fwengine); \ } \ -REG_READ_FOOTER ; \ +GEN6_READ_FOOTER ; \ }__gen9_read (8 )
@@ -844,55 +867,66 @@ __gen6_read(8) __gen6_read(16) __gen6_read(32) __gen6_read(64) -__gen5_read(8) -__gen5_read(16) -__gen5_read(32) -__gen5_read(64) -__gen4_read(8) -__gen4_read(16) -__gen4_read(32) -__gen4_read(64)#undef __gen9_read#undef __chv_read#undef __vlv_read#undef __gen6_read -#undef __gen5_read -#undef __gen4_read -#undef REG_READ_FOOTER -#undef REG_READ_HEADER +#undef GEN6_READ_FOOTER +#undef GEN6_READ_HEADER -#define REG_WRITE_HEADER \ - unsigned long irqflags; \ +#define GEN2_WRITE_HEADER \ trace_i915_reg_rw(true, reg, val, sizeof(val), trace); \ assert_device_not_suspended(dev_priv); \ - spin_lock_irqsave(&dev_priv->uncore.lock, irqflags) -#define REG_WRITE_FOOTER \ - spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags) +#define GEN2_WRITE_FOOTER -#define __gen4_write (x) \ +#define __gen2_write (x) \ static void \ -gen4_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, bool trace) { \ - REG_WRITE_HEADER; \ +gen2_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, bool trace) { \ + GEN2_WRITE_HEADER; \ __raw_i915_write##x(dev_priv, reg, val); \ - REG_WRITE_FOOTER; \ + GEN2_WRITE_FOOTER; \ }#define __gen5_write (x) \ static void \ gen5_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, bool trace) { \ - REG_WRITE_HEADER; \ + GEN2_WRITE_HEADER; \ ilk_dummy_write(dev_priv); \ __raw_i915_write##x(dev_priv, reg, val); \ - REG_WRITE_FOOTER; \ + GEN2_WRITE_FOOTER; \ } +__gen5_write(8) +__gen5_write(16) +__gen5_write(32) +__gen5_write(64) +__gen2_write(8) +__gen2_write(16) +__gen2_write(32) +__gen2_write(64) + +#undef __gen5_write +#undef __gen2_write + +#undef GEN2_WRITE_FOOTER +#undef GEN2_WRITE_HEADER + +#define GEN6_WRITE_HEADER \ + unsigned long irqflags; \ + trace_i915_reg_rw(true, reg, val, sizeof(val), trace); \ + assert_device_not_suspended(dev_priv); \ + spin_lock_irqsave(&dev_priv->uncore.lock, irqflags) + +#define GEN6_WRITE_FOOTER \ + spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags) +#define __gen6_write (x) \ static void \ gen6_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, bool trace) { \ u32 __fifo_ret = 0; \ - REG_WRITE_HEADER; \ + GEN6_WRITE_HEADER; \ if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \ __fifo_ret = __gen6_gt_wait_for_fifo(dev_priv); \ } \
@@ -900,14 +934,14 @@ gen6_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, bool traceif (unlikely (__fifo_ret)) { \gen6_gt_check_fifodbg (dev_priv); \ } \ -REG_WRITE_FOOTER ; \ +GEN6_WRITE_FOOTER ; \ }#define __hsw_write (x) \ static void \ hsw_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, bool trace) { \ u32 __fifo_ret = 0; \ - REG_WRITE_HEADER; \ + GEN6_WRITE_HEADER; \ if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \ __fifo_ret = __gen6_gt_wait_for_fifo(dev_priv); \ } \
@@ -918,7 +952,7 @@ hsw_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, bool trace) } \hsw_unclaimed_reg_debug (dev_priv, reg, false, false); \hsw_unclaimed_reg_detect (dev_priv); \ -REG_WRITE_FOOTER ; \ +GEN6_WRITE_FOOTER ; \ }static const u32 gen8_shadowed_regs[] = {
@@ -945,7 +979,7 @@ static bool is_gen8_shadowed(struct drm_i915_private *dev_priv, u32 reg)#define __gen8_write (x) \ static void \ gen8_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, bool trace) { \ - REG_WRITE_HEADER; \ + GEN6_WRITE_HEADER; \ hsw_unclaimed_reg_debug(dev_priv, reg, false, true); \ if (reg < 0x40000 && !is_gen8_shadowed(dev_priv, reg)) { \ if (dev_priv->uncore.forcewake_count == 0) \
@@ -960,7 +994,7 @@ gen8_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, bool trace } \hsw_unclaimed_reg_debug (dev_priv, reg, false, false); \hsw_unclaimed_reg_detect (dev_priv); \ -REG_WRITE_FOOTER ; \ +GEN6_WRITE_FOOTER ; \ }#define __chv_write (x) \
@@ -968,7 +1002,7 @@ static void \ chv_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, bool trace) { \ unsigned fwengine = 0; \ bool shadowed = is_gen8_shadowed(dev_priv, reg); \ - REG_WRITE_HEADER; \ + GEN6_WRITE_HEADER; \ if (!shadowed) { \ if (FORCEWAKE_CHV_RENDER_RANGE_OFFSET(reg)) { \ if (dev_priv->uncore.fw_rendercount == 0) \
@@ -988,7 +1022,7 @@ chv_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, bool trace) __raw_i915_write##x(dev_priv, reg, val); \ if (fwengine) \ dev_priv->uncore.funcs.force_wake_put(dev_priv, fwengine); \ - REG_WRITE_FOOTER; \ + GEN6_WRITE_FOOTER; \ }static const u32 gen9_shadowed_regs[] = {
@@ -1018,7 +1052,7 @@ static bool is_gen9_shadowed(struct drm_i915_private *dev_priv, u32 reg) static void \ gen9_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, \ bool trace) { \ - REG_WRITE_HEADER; \ + GEN6_WRITE_HEADER; \ if (!SKL_NEEDS_FORCE_WAKE((dev_priv), (reg)) || \ is_gen9_shadowed(dev_priv, reg)) { \ __raw_i915_write##x(dev_priv, reg, val); \
@@ -1047,7 +1081,7 @@ gen9_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, \ dev_priv->uncore.funcs.force_wake_put (dev_priv, \ fwengine); \ } \ -REG_WRITE_FOOTER ; \ +GEN6_WRITE_FOOTER ; \ }__gen9_write (8 )
@@ -1070,24 +1104,14 @@ __gen6_write(8) __gen6_write(16) __gen6_write(32) __gen6_write(64) -__gen5_write(8) -__gen5_write(16) -__gen5_write(32) -__gen5_write(64) -__gen4_write(8) -__gen4_write(16) -__gen4_write(32) -__gen4_write(64)#undef __gen9_write#undef __chv_write#undef __gen8_write#undef __hsw_write#undef __gen6_write -#undef __gen5_write -#undef __gen4_write -#undef REG_WRITE_FOOTER -#undef REG_WRITE_HEADER +#undef GEN6_WRITE_FOOTER +#undef GEN6_WRITE_HEADER#define ASSIGN_WRITE_MMIO_VFUNCS (x) \ do { \
@@ -1200,8 +1224,8 @@ void intel_uncore_init(struct drm_device *dev)case 4 :case 3 :case 2 : -ASSIGN_WRITE_MMIO_VFUNCS (gen4); -ASSIGN_READ_MMIO_VFUNCS (gen4); +ASSIGN_WRITE_MMIO_VFUNCS (gen2); +ASSIGN_READ_MMIO_VFUNCS (gen2);break ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/9 drm/i915: Reduce duplicated forcewake logic
In reply to Mika KuoppalaFrom: Chris Wilson <[email protected]>
Introduce a structure to track the individual forcewake domains and use that to eliminate duplicate logic.
v2: - Rebase on latest dinq (Mika)
- for_each_fw_domain macro (Mika)
- Handle reset atomically, keeping the timer running (Mika)
- for_each_fw_domain parameter ordering (Chris)
- defer timer on new register access (Mika)
v3: - Fix forcewake_reset/get race by waiting pending timers
--- drivers/gpu/drm/i915/i915_debugfs.c | 65 +++--- drivers/gpu/drm/i915/i915_drv.h | 54 +++-- drivers/gpu/drm/i915/intel_uncore.c | 435 ++++++++++++++---------------------- 3 files changed, 236 insertions(+), 318 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +26 -39
@@ -1288,14 +1288,36 @@ static int ironlake_drpc_info(struct seq_file *m)return 0 ; } -static int vlv_drpc_info (struct seq_file *m) +static int i915_gen6_forcewake_count_info (struct seq_file *m,void *data) { +struct drm_info_node *node = m->private; +struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_uncore_forcewake_domain *fw_domain; +const char *domain_names[] = { +"render" , +"blitter" , +"media" , + }; +int i; + +spin_lock_irq (&dev_priv->uncore.lock); +for_each_fw_domain (fw_domain, dev_priv, i) { +seq_printf (m,"%s.wake_count = %u\n" , + domain_names[i], + fw_domain->wake_count); + } +spin_unlock_irq (&dev_priv->uncore.lock); +return 0 ; +} + +static int vlv_drpc_info (struct seq_file *m) +{struct drm_info_node *node = m->private;struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv = dev->dev_private;u32 rpmodectl1, rcctl1, pw_status; -unsigned fw_rendercount =0 , fw_mediacount =0 ;intel_runtime_pm_get (dev_priv);
@@ -1327,22 +1349,11 @@ static int vlv_drpc_info(struct seq_file *m)seq_printf (m,"Media RC6 residency since boot: %u\n" ,I915_READ (VLV_GT_MEDIA_RC6 )); -spin_lock_irq (&dev_priv->uncore.lock); - fw_rendercount = dev_priv->uncore.fw_rendercount; - fw_mediacount = dev_priv->uncore.fw_mediacount; -spin_unlock_irq (&dev_priv->uncore.lock); - -seq_printf (m,"Forcewake Render Count = %u\n" , fw_rendercount); -seq_printf (m,"Forcewake Media Count = %u\n" , fw_mediacount); - - -return 0 ; +return i915_gen6_forcewake_count_info (m,NULL ); } -static int gen6_drpc_info (struct seq_file *m) { -struct drm_info_node *node = m->private;struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1356,7 +1367,7 @@ static int gen6_drpc_info(struct seq_file *m)intel_runtime_pm_get (dev_priv);spin_lock_irq (&dev_priv->uncore.lock); - forcewake_count = dev_priv->uncore.forcewake_count; + forcewake_count = dev_priv->uncore.fw_domain[FW_DOMAIN_ID_RENDER ].wake_count;spin_unlock_irq (&dev_priv->uncore.lock);if (forcewake_count) {
@@ -1984,30 +1995,6 @@ static int i915_execlists(struct seq_file *m, void *data)return 0 ; } -static int i915_gen6_forcewake_count_info (struct seq_file *m,void *data) -{ -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv = dev->dev_private; -unsigned forcewake_count =0 , fw_rendercount =0 , fw_mediacount =0 ; - -spin_lock_irq (&dev_priv->uncore.lock); -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); - -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 ; -} -static const char *swizzle_string (unsigned swizzle) {switch (swizzle) {
drivers/gpu/drm/i915/i915_drv.h +37 -17
78 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uncore.c +173 -262
639 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/9] drm/i915: Reduce duplicated forcewake logic
Quoted 49 lines · Mika Kuoppala
drivers/gpu/drm/i915/intel_uncore.c +18
-25+void intel_uncore_forcewake_reset (struct drm_device *dev,bool restore) { -if (FORCEWAKE_RENDER & fw_engine) { -WARN_ON (dev_priv->uncore.fw_rendercount ==0 ); -if (--dev_priv->uncore.fw_rendercount ==0 ) - dev_priv->uncore.funcs.force_wake_put (dev_priv, -FORCEWAKE_RENDER ); - } +struct drm_i915_private *dev_priv = dev->dev_private; +unsigned long irqflags, fw =0 ; +struct intel_uncore_forcewake_domain *domain; +int id, active_domains, retry_count =100 ; -if (FORCEWAKE_MEDIA & fw_engine) { -WARN_ON (dev_priv->uncore.fw_mediacount ==0 ); -if (--dev_priv->uncore.fw_mediacount ==0 ) - dev_priv->uncore.funcs.force_wake_put (dev_priv, -FORCEWAKE_MEDIA ); - } +/* Hold uncore.lock across reset to prevent any register access +* with forcewake not set correctly. Wait until all pending +* timers are run before holding. +*/ +while (1 ) { + active_domains =0 ; -if (FORCEWAKE_BLITTER & fw_engine) { -WARN_ON (dev_priv->uncore.fw_blittercount ==0 ); -if (--dev_priv->uncore.fw_blittercount ==0 ) - dev_priv->uncore.funcs.force_wake_put (dev_priv, -FORCEWAKE_BLITTER ); - } -} +for_each_fw_domain (domain, dev_priv, id) +del_timer_sync (&domain->timer); -static void gen6_force_wake_timer (unsigned long arg) -{ -struct drm_i915_private *dev_priv = (void *)arg; -unsigned long irqflags; +spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); -assert_device_not_suspended (dev_priv); +for_each_fw_domain (domain, dev_priv, id) { +if (timer_pending (&domain->timer)) + active_domains |= (1 << id); + } -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags);
drivers/gpu/drm/i915/intel_uncore.c __gen9_force_wake_put(struct drm_i915_private *dev_priv, int fw_engine) · line 384
Quoted 10 lines
drivers/gpu/drm/i915/intel_uncore.c +4
-5-WARN_ON (!dev_priv->uncore.forcewake_count); +if (active_domains ==0 || --retry_count ==0 ) +break ; -if (--dev_priv->uncore.forcewake_count ==0 ) - dev_priv->uncore.funcs.force_wake_put (dev_priv,FORCEWAKE_ALL ); -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); -} +spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); + }
One minor thing that occurs to me is that we should put a cond_resched() here to encourage the timers to clear.
Also:
if (active_domains == 0)
break;
if (--retry_count == 0) {
DRM_ERROR("Timed out waiting for forcewake timers to finish\n");
break;
}would be prudent in case we hit the race condition and do go ahead in the confused state.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/9 drm/i915: Reduce duplicated forcewake logic
From: Chris Wilson <[email protected]>
Introduce a structure to track the individual forcewake domains and use that to eliminate duplicate logic.
v2: - Rebase on latest dinq (Mika)
- for_each_fw_domain macro (Mika)
- Handle reset atomically, keeping the timer running (Mika)
- for_each_fw_domain parameter ordering (Chris)
- defer timer on new register access (Mika)
v3: - Fix forcewake_reset/get race by waiting pending timers
v4: - cond_resched and verbose warning on timer deletion (Chris)
- need to run pending timers manually on reset
--- drivers/gpu/drm/i915/i915_debugfs.c | 65 +++--- drivers/gpu/drm/i915/i915_drv.h | 54 +++-- drivers/gpu/drm/i915/intel_uncore.c | 445 +++++++++++++++--------------------- 3 files changed, 246 insertions(+), 318 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +26 -39
@@ -1288,14 +1288,36 @@ static int ironlake_drpc_info(struct seq_file *m)return 0 ; } -static int vlv_drpc_info (struct seq_file *m) +static int i915_gen6_forcewake_count_info (struct seq_file *m,void *data) { +struct drm_info_node *node = m->private; +struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_uncore_forcewake_domain *fw_domain; +const char *domain_names[] = { +"render" , +"blitter" , +"media" , + }; +int i; + +spin_lock_irq (&dev_priv->uncore.lock); +for_each_fw_domain (fw_domain, dev_priv, i) { +seq_printf (m,"%s.wake_count = %u\n" , + domain_names[i], + fw_domain->wake_count); + } +spin_unlock_irq (&dev_priv->uncore.lock); +return 0 ; +} + +static int vlv_drpc_info (struct seq_file *m) +{struct drm_info_node *node = m->private;struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv = dev->dev_private;u32 rpmodectl1, rcctl1, pw_status; -unsigned fw_rendercount =0 , fw_mediacount =0 ;intel_runtime_pm_get (dev_priv);
@@ -1327,22 +1349,11 @@ static int vlv_drpc_info(struct seq_file *m)seq_printf (m,"Media RC6 residency since boot: %u\n" ,I915_READ (VLV_GT_MEDIA_RC6 )); -spin_lock_irq (&dev_priv->uncore.lock); - fw_rendercount = dev_priv->uncore.fw_rendercount; - fw_mediacount = dev_priv->uncore.fw_mediacount; -spin_unlock_irq (&dev_priv->uncore.lock); - -seq_printf (m,"Forcewake Render Count = %u\n" , fw_rendercount); -seq_printf (m,"Forcewake Media Count = %u\n" , fw_mediacount); - - -return 0 ; +return i915_gen6_forcewake_count_info (m,NULL ); } -static int gen6_drpc_info (struct seq_file *m) { -struct drm_info_node *node = m->private;struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1356,7 +1367,7 @@ static int gen6_drpc_info(struct seq_file *m)intel_runtime_pm_get (dev_priv);spin_lock_irq (&dev_priv->uncore.lock); - forcewake_count = dev_priv->uncore.forcewake_count; + forcewake_count = dev_priv->uncore.fw_domain[FW_DOMAIN_ID_RENDER ].wake_count;spin_unlock_irq (&dev_priv->uncore.lock);if (forcewake_count) {
@@ -1984,30 +1995,6 @@ static int i915_execlists(struct seq_file *m, void *data)return 0 ; } -static int i915_gen6_forcewake_count_info (struct seq_file *m,void *data) -{ -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv = dev->dev_private; -unsigned forcewake_count =0 , fw_rendercount =0 , fw_mediacount =0 ; - -spin_lock_irq (&dev_priv->uncore.lock); -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); - -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 ; -} -static const char *swizzle_string (unsigned swizzle) {switch (swizzle) {
drivers/gpu/drm/i915/i915_drv.h +37 -17
78 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uncore.c +183 -262
649 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/9 drm/i915: Consolidate forcewake code
In reply to Mika KuoppalaAs we now have forcewake domains, take advantage of it by putting the differences in gen fw handling in data rather than in code.
In past we have opencoded this quite extensively as the fw handling is in the fast path. There has also been a lot of cargo-culted copy'n'pasting from older gens to newer ones.
Now when the releasing of the forcewake is done by deferred timer, it gives chance to consolidate more. Due to the frequency of actual hw access being significantly less.
Take advantage of this and generalize the fw handling code as much as possible. But we still aim to keep the forcewake sequence particularities for each gen intact. So the access pattern to fw engines should remain the same.
v2: - s/old_ack/clear_ack (Chris)
- s/post_read/posting_read (Chris)
- less polite commit msg (Chris)
v3: - rebase
- check and clear wake_count in init
--- drivers/gpu/drm/i915/i915_debugfs.c | 7 +- drivers/gpu/drm/i915/i915_drv.h | 7 + drivers/gpu/drm/i915/intel_uncore.c | 469 ++++++++++++++++-------------------- 3 files changed, 213 insertions(+), 270 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -6
@@ -1294,17 +1294,12 @@ static int i915_gen6_forcewake_count_info(struct seq_file *m, void *data)struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_uncore_forcewake_domain *fw_domain; -const char *domain_names[] = { -"render" , -"blitter" , -"media" , - };int i;spin_lock_irq (&dev_priv->uncore.lock);for_each_fw_domain (fw_domain, dev_priv, i) {seq_printf (m,"%s.wake_count = %u\n" , - domain_names[i], +intel_uncore_forcewake_domain_to_str (i), fw_domain->wake_count); }spin_unlock_irq (&dev_priv->uncore.lock);
drivers/gpu/drm/i915/i915_drv.h +7 -0
@@ -616,6 +616,12 @@ struct intel_uncore {int id;unsigned wake_count;struct timer_list timer; +u32 reg_set; +u32 val_set; +u32 val_clear; +u32 reg_ack; +u32 reg_post; +u32 val_reset; } fw_domain[FW_DOMAIN_ID_COUNT ];#define FORCEWAKE_RENDER (1 << FW_DOMAIN_ID_RENDER)#define FORCEWAKE_BLITTER (1 << FW_DOMAIN_ID_BLITTER)
@@ -2500,6 +2506,7 @@ extern void intel_uncore_init(struct drm_device *dev);extern void intel_uncore_check_errors (struct drm_device *dev);extern void intel_uncore_fini (struct drm_device *dev);extern void intel_uncore_forcewake_reset (struct drm_device *dev,bool restore); +const char *intel_uncore_forcewake_domain_to_str (const int domain_id); void i915_enable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
drivers/gpu/drm/i915/intel_uncore.c +205 -264
598 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/9 drm/i915: Make vlv and chv forcewake put generic.
In reply to Mika KuoppalaThese two were using a fw dance logic where posting read was done after both domain bit were set. When in other gens, the posting read is done immediately after setting the forcewake bit for each domain.
Now bring these in line with other gens.
--- drivers/gpu/drm/i915/intel_uncore.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +5 -11
@@ -232,16 +232,6 @@ static int __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv)return ret; } -static void __vlv_force_wake_put (struct drm_i915_private *dev_priv, -int fw_engine) -{ -fw_domains_put (dev_priv, fw_engine); -fw_domains_posting_read (dev_priv); - -if (!IS_CHERRYVIEW (dev_priv->dev)) -gen6_gt_check_fifodbg (dev_priv); -} -static void gen6_force_wake_timer (unsigned long arg) {struct intel_uncore_forcewake_domain *domain = (void *)arg;
@@ -986,7 +976,11 @@ void intel_uncore_init(struct drm_device *dev) FORCEWAKE_MEDIA_GEN9, FORCEWAKE_ACK_MEDIA_GEN9); }else if (IS_VALLEYVIEW (dev)) { dev_priv->uncore.funcs.force_wake_get = fw_domains_get; - dev_priv->uncore.funcs.force_wake_put = __vlv_force_wake_put; +if (!IS_CHERRYVIEW (dev)) + dev_priv->uncore.funcs.force_wake_put = + fw_domains_put_with_fifo; +else + dev_priv->uncore.funcs.force_wake_put = fw_domains_put;fw_domain_init (dev_priv,FW_DOMAIN_ID_RENDER ,FORCEWAKE_VLV ,FORCEWAKE_ACK_VLV ); fw_domain_init(dev_priv, FW_DOMAIN_ID_MEDIA,
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/9 drm/i915: Rename the forcewake get/put functions
In reply to Mika KuoppalaWe have multiple forcewake domains now on recent gens. Change the function naming to reflect this.
v2: More verbose names (Chris)
v3: Rebase (Mika)
--- drivers/gpu/drm/i915/i915_debugfs.c | 8 ++++---- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 15 +++++---------- drivers/gpu/drm/i915/intel_display.c | 4 ++-- drivers/gpu/drm/i915/intel_fbc.c | 4 ++-- drivers/gpu/drm/i915/intel_lrc.c | 4 ++-- drivers/gpu/drm/i915/intel_pm.c | 25 ++++++++++++------------- drivers/gpu/drm/i915/intel_ringbuffer.c | 4 ++-- drivers/gpu/drm/i915/intel_uncore.c | 20 ++++++++++---------- 9 files changed, 40 insertions(+), 46 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +4 -4
@@ -1105,7 +1105,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)if (ret) goto out; -gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); reqf =I915_READ (GEN6_RPNSWREQ ); reqf &= ~GEN6_TURBO_DISABLE ;
@@ -1132,7 +1132,7 @@ static int i915_frequency_info(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,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );mutex_unlock (&dev->struct_mutex);if (IS_GEN6 (dev) ||IS_GEN7 (dev)) {
@@ -4318,7 +4318,7 @@ static int i915_forcewake_open(struct inode *inode, struct file *file)return 0 ;intel_runtime_pm_get (dev_priv); -gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );return 0 ; }
@@ -4331,7 +4331,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,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );intel_runtime_pm_put (dev_priv);return 0 ;
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -1431,7 +1431,7 @@ static int intel_runtime_suspend(struct device *device)intel_opregion_notify_adapter (dev, PCI_D3hot); } -assert_force_wake_inactive (dev_priv); +assert_forcewakes_inactive (dev_priv);DRM_DEBUG_KMS ("Device suspended\n" );return 0 ;
drivers/gpu/drm/i915/i915_drv.h +5 -10
@@ -2507,6 +2507,11 @@ extern void intel_uncore_check_errors(struct drm_device *dev);extern void intel_uncore_fini (struct drm_device *dev);extern void intel_uncore_forcewake_reset (struct drm_device *dev,bool restore);const char *intel_uncore_forcewake_domain_to_str (const int domain_id); +void intel_uncore_forcewake_get (struct drm_i915_private *dev_priv, +unsigned fw_domains); +void intel_uncore_forcewake_put (struct drm_i915_private *dev_priv, +unsigned fw_domains); +void assert_forcewakes_inactive (struct drm_i915_private *dev_priv); void i915_enable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
@@ -3135,16 +3140,6 @@ extern void intel_display_print_error_state(struct drm_i915_error_state_buf *e,struct drm_device *dev, struct intel_display_error_state *error); -/* On SNB platform, before reading ring registers forcewake bit -* 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, -unsigned fw_domains); -void gen6_gt_force_wake_put (struct drm_i915_private *dev_priv, -unsigned fw_domains); -void assert_force_wake_inactive (struct drm_i915_private *dev_priv); -int sandybridge_pcode_read (struct drm_i915_private *dev_priv,u32 mbox,u32 *val);int sandybridge_pcode_write (struct drm_i915_private *dev_priv,u32 mbox,u32 val);
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -7863,7 +7863,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. To prevent PC8 state, just enable force_wake. */ -gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );if (val &LCPLL_POWER_DOWN_ALLOW ) { val &= ~LCPLL_POWER_DOWN_ALLOW ;
@@ -7893,7 +7893,7 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv)DRM_ERROR ("Switching back to LCPLL failed\n" ); } -gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); }/*
drivers/gpu/drm/i915/intel_fbc.c +2 -2
@@ -182,7 +182,7 @@ static void snb_fbc_blit_update(struct drm_device *dev)/* 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 ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_MEDIA ); blt_ecoskpd =I915_READ (GEN6_BLITTER_ECOSKPD ); blt_ecoskpd |= GEN6_BLITTER_FBC_NOTIFY <<
@@ -195,7 +195,7 @@ static void snb_fbc_blit_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_MEDIA ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_MEDIA ); }static void ilk_fbc_enable (struct drm_crtc *crtc)
drivers/gpu/drm/i915/intel_lrc.c +2 -2
@@ -296,7 +296,7 @@ static void execlists_elsp_write(struct intel_engine_cs *ring, desc[3 ] = (u32)(temp >>32 ); desc[2 ] = (u32 )temp; -gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );I915_WRITE (RING_ELSP (ring), desc[1 ]);I915_WRITE (RING_ELSP (ring), desc[0 ]);I915_WRITE (RING_ELSP (ring), desc[3 ]);
@@ -306,7 +306,7 @@ static void execlists_elsp_write(struct intel_engine_cs *ring,/* ELSP is a wo register, so use another nearby reg for posting instead */ POSTING_READ (RING_EXECLIST_STATUS (ring)); -gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); } static int execlists_update_context(struct drm_i915_gem_object *ctx_obj,
drivers/gpu/drm/i915/intel_pm.c +12 -13
@@ -76,7 +76,6 @@ static void gen9_init_clock_gating(struct drm_device *dev) _MASKED_BIT_ENABLE(GEN8_4x4_STC_OPTIMIZATION_DISABLE)); } -static void i915_pineview_get_mem_freq (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -3923,11 +3922,11 @@ static void valleyview_disable_rps(struct drm_device *dev)/* we're doing forcewake before Disabling RC6, * This what the BIOS expects when going into suspend */ -gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );I915_WRITE (GEN6_RC_CONTROL ,0 ); -gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); }static void intel_print_rc6_info (struct drm_device *dev,u32 mode)
@@ -4045,7 +4044,7 @@ static void gen9_enable_rps(struct drm_device *dev)/* 1b: 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,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );/* 2a: Disable RC states. */ I915_WRITE (GEN6_RC_CONTROL ,0 );
@@ -4068,7 +4067,7 @@ static void gen9_enable_rps(struct drm_device *dev)GEN6_RC_CTL_EI_MODE (1 ) | rc6_mask); -gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); }
@@ -4084,7 +4083,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,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );/* 2a: Disable RC states. */ I915_WRITE (GEN6_RC_CONTROL ,0 );
@@ -4151,7 +4150,7 @@ static void gen8_enable_rps(struct drm_device *dev) dev_priv->rps.power =HIGH_POWER ;/* force a reset */ gen6_set_rps (dev_priv->dev, dev_priv->rps.min_freq_softlimit); -gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); }static void gen6_enable_rps (struct drm_device *dev)
@@ -4179,7 +4178,7 @@ static void gen6_enable_rps(struct drm_device *dev)I915_WRITE (GTFIFODBG , gtfifodbg); } -gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );/* Initialize rps frequencies */ gen6_init_rps_frequencies (dev);
@@ -4259,7 +4258,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,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); }static void __gen6_update_ring_freq (struct drm_device *dev)
@@ -4678,7 +4677,7 @@ static void cherryview_enable_rps(struct drm_device *dev)/* 1a & 1b: 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,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );/* 2a: Program RC6 thresholds.*/ I915_WRITE (GEN6_RC6_WAKE_RATE_LIMIT ,40 <<16 );
@@ -4747,7 +4746,7 @@ static void cherryview_enable_rps(struct drm_device *dev)valleyview_set_rps (dev_priv->dev, dev_priv->rps.efficient_freq); -gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); }static void valleyview_enable_rps (struct drm_device *dev)
@@ -4768,7 +4767,7 @@ static void valleyview_enable_rps(struct drm_device *dev) }/* If VLV, Forcewake all wells, else re-direct to regular path */ -gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );I915_WRITE (GEN6_RP_UP_THRESHOLD ,59400 );I915_WRITE (GEN6_RP_DOWN_THRESHOLD ,245000 );
@@ -4828,7 +4827,7 @@ static void valleyview_enable_rps(struct drm_device *dev)valleyview_set_rps (dev_priv->dev, dev_priv->rps.efficient_freq); -gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); }void ironlake_teardown_rc6 (struct drm_device *dev)
drivers/gpu/drm/i915/intel_ringbuffer.c +2 -2
@@ -536,7 +536,7 @@ static int init_ring_common(struct intel_engine_cs *ring)struct drm_i915_gem_object *obj = ringbuf->obj;int ret =0 ; -gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );if (!stop_ring (ring)) {/* G45 ring initialization often fails to reset head to zero */
@@ -608,7 +608,7 @@ static int init_ring_common(struct intel_engine_cs *ring)memset (&ring->hangcheck,0 ,sizeof (ring->hangcheck)); out: -gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );return ret; }
drivers/gpu/drm/i915/intel_uncore.c +10 -10
@@ -232,7 +232,7 @@ static int __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv)return ret; } -static void gen6_force_wake_timer (unsigned long arg) +static void intel_uncore_fw_release_timer (unsigned long arg) {struct intel_uncore_forcewake_domain *domain = (void *)arg;unsigned long irqflags;
@@ -302,7 +302,7 @@ void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore) }if (!restore) -assert_force_wake_inactive (dev_priv); +assert_forcewakes_inactive (dev_priv);spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); }
@@ -350,10 +350,10 @@ void intel_uncore_sanitize(struct drm_device *dev)* Generally this is called implicitly by the register read function. However, * if some sequence requires the GT to not power down then this function should * be called at the beginning of the sequence followed by a call to -* gen6_gt_force_wake_put() at the end of the sequence. +* intel_uncore_forcewake_put() at the end of the sequence. */ -void gen6_gt_force_wake_get (struct drm_i915_private *dev_priv, -unsigned fw_domains) +void intel_uncore_forcewake_get (struct drm_i915_private *dev_priv, +unsigned fw_domains) {unsigned long irqflags;struct intel_uncore_forcewake_domain *domain;
@@ -380,10 +380,10 @@ void gen6_gt_force_wake_get(struct drm_i915_private *dev_priv, }/* -* see gen6_gt_force_wake_get() +* see intel_uncore_forcewake_get() */ -void gen6_gt_force_wake_put (struct drm_i915_private *dev_priv, -unsigned fw_domains) +void intel_uncore_forcewake_put (struct drm_i915_private *dev_priv, +unsigned fw_domains) {unsigned long irqflags;struct intel_uncore_forcewake_domain *domain;
@@ -410,7 +410,7 @@ void gen6_gt_force_wake_put(struct drm_i915_private *dev_priv,spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); } -void assert_force_wake_inactive (struct drm_i915_private *dev_priv) +void assert_forcewakes_inactive (struct drm_i915_private *dev_priv) {struct intel_uncore_forcewake_domain *domain;int id;
@@ -952,7 +952,7 @@ static void fw_domain_init(struct drm_i915_private *dev_priv, d->i915 = dev_priv; d->id = domain_id; -setup_timer (&d->timer, gen6_force_wake_timer, (unsigned long )d); +setup_timer (&d->timer, intel_uncore_fw_release_timer, (unsigned long )d); dev_priv->uncore.fw_domains |= (1 << domain_id); }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/9 drm/i915: Rename the forcewake get/put functions
From: Mika Kuoppala <[email protected]>
We have multiple forcewake domains now on recent gens. Change the function naming to reflect this.
v2: More verbose names (Chris)
v3: Rebase
v4: Rebase
--- drivers/gpu/drm/i915/i915_debugfs.c | 8 ++++---- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 15 +++++---------- drivers/gpu/drm/i915/intel_display.c | 4 ++-- drivers/gpu/drm/i915/intel_fbc.c | 4 ++-- drivers/gpu/drm/i915/intel_lrc.c | 4 ++-- drivers/gpu/drm/i915/intel_pm.c | 25 ++++++++++++------------- drivers/gpu/drm/i915/intel_ringbuffer.c | 4 ++-- drivers/gpu/drm/i915/intel_uncore.c | 22 +++++++++++----------- 9 files changed, 41 insertions(+), 47 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +4 -4
@@ -1105,7 +1105,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)if (ret) goto out; -gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); reqf =I915_READ (GEN6_RPNSWREQ ); reqf &= ~GEN6_TURBO_DISABLE ;
@@ -1132,7 +1132,7 @@ static int i915_frequency_info(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,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );mutex_unlock (&dev->struct_mutex);if (IS_GEN6 (dev) ||IS_GEN7 (dev)) {
@@ -4318,7 +4318,7 @@ static int i915_forcewake_open(struct inode *inode, struct file *file)return 0 ;intel_runtime_pm_get (dev_priv); -gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );return 0 ; }
@@ -4331,7 +4331,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,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );intel_runtime_pm_put (dev_priv);return 0 ;
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -1431,7 +1431,7 @@ static int intel_runtime_suspend(struct device *device)intel_opregion_notify_adapter (dev, PCI_D3hot); } -assert_force_wake_inactive (dev_priv); +assert_forcewakes_inactive (dev_priv);DRM_DEBUG_KMS ("Device suspended\n" );return 0 ;
drivers/gpu/drm/i915/i915_drv.h +5 -10
@@ -2507,6 +2507,11 @@ extern void intel_uncore_check_errors(struct drm_device *dev);extern void intel_uncore_fini (struct drm_device *dev);extern void intel_uncore_forcewake_reset (struct drm_device *dev,bool restore);const char *intel_uncore_forcewake_domain_to_str (const int domain_id); +void intel_uncore_forcewake_get (struct drm_i915_private *dev_priv, +unsigned fw_domains); +void intel_uncore_forcewake_put (struct drm_i915_private *dev_priv, +unsigned fw_domains); +void assert_forcewakes_inactive (struct drm_i915_private *dev_priv); void i915_enable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
@@ -3135,16 +3140,6 @@ extern void intel_display_print_error_state(struct drm_i915_error_state_buf *e,struct drm_device *dev, struct intel_display_error_state *error); -/* On SNB platform, before reading ring registers forcewake bit -* 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, -unsigned fw_domains); -void gen6_gt_force_wake_put (struct drm_i915_private *dev_priv, -unsigned fw_domains); -void assert_force_wake_inactive (struct drm_i915_private *dev_priv); -int sandybridge_pcode_read (struct drm_i915_private *dev_priv,u32 mbox,u32 *val);int sandybridge_pcode_write (struct drm_i915_private *dev_priv,u32 mbox,u32 val);
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -7863,7 +7863,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. To prevent PC8 state, just enable force_wake. */ -gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );if (val &LCPLL_POWER_DOWN_ALLOW ) { val &= ~LCPLL_POWER_DOWN_ALLOW ;
@@ -7893,7 +7893,7 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv)DRM_ERROR ("Switching back to LCPLL failed\n" ); } -gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); }/*
drivers/gpu/drm/i915/intel_fbc.c +2 -2
@@ -182,7 +182,7 @@ static void snb_fbc_blit_update(struct drm_device *dev)/* 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 ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_MEDIA ); blt_ecoskpd =I915_READ (GEN6_BLITTER_ECOSKPD ); blt_ecoskpd |= GEN6_BLITTER_FBC_NOTIFY <<
@@ -195,7 +195,7 @@ static void snb_fbc_blit_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_MEDIA ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_MEDIA ); }static void ilk_fbc_enable (struct drm_crtc *crtc)
drivers/gpu/drm/i915/intel_lrc.c +2 -2
@@ -296,7 +296,7 @@ static void execlists_elsp_write(struct intel_engine_cs *ring, desc[3 ] = (u32)(temp >>32 ); desc[2 ] = (u32 )temp; -gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );I915_WRITE (RING_ELSP (ring), desc[1 ]);I915_WRITE (RING_ELSP (ring), desc[0 ]);I915_WRITE (RING_ELSP (ring), desc[3 ]);
@@ -306,7 +306,7 @@ static void execlists_elsp_write(struct intel_engine_cs *ring,/* ELSP is a wo register, so use another nearby reg for posting instead */ POSTING_READ (RING_EXECLIST_STATUS (ring)); -gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); } static int execlists_update_context(struct drm_i915_gem_object *ctx_obj,
drivers/gpu/drm/i915/intel_pm.c +12 -13
@@ -76,7 +76,6 @@ static void gen9_init_clock_gating(struct drm_device *dev) _MASKED_BIT_ENABLE(GEN8_4x4_STC_OPTIMIZATION_DISABLE)); } -static void i915_pineview_get_mem_freq (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -3923,11 +3922,11 @@ static void valleyview_disable_rps(struct drm_device *dev)/* we're doing forcewake before Disabling RC6, * This what the BIOS expects when going into suspend */ -gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );I915_WRITE (GEN6_RC_CONTROL ,0 ); -gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); }static void intel_print_rc6_info (struct drm_device *dev,u32 mode)
@@ -4045,7 +4044,7 @@ static void gen9_enable_rps(struct drm_device *dev)/* 1b: 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,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );/* 2a: Disable RC states. */ I915_WRITE (GEN6_RC_CONTROL ,0 );
@@ -4068,7 +4067,7 @@ static void gen9_enable_rps(struct drm_device *dev)GEN6_RC_CTL_EI_MODE (1 ) | rc6_mask); -gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); }
@@ -4084,7 +4083,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,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );/* 2a: Disable RC states. */ I915_WRITE (GEN6_RC_CONTROL ,0 );
@@ -4151,7 +4150,7 @@ static void gen8_enable_rps(struct drm_device *dev) dev_priv->rps.power =HIGH_POWER ;/* force a reset */ gen6_set_rps (dev_priv->dev, dev_priv->rps.min_freq_softlimit); -gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); }static void gen6_enable_rps (struct drm_device *dev)
@@ -4179,7 +4178,7 @@ static void gen6_enable_rps(struct drm_device *dev)I915_WRITE (GTFIFODBG , gtfifodbg); } -gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );/* Initialize rps frequencies */ gen6_init_rps_frequencies (dev);
@@ -4259,7 +4258,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,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); }static void __gen6_update_ring_freq (struct drm_device *dev)
@@ -4678,7 +4677,7 @@ static void cherryview_enable_rps(struct drm_device *dev)/* 1a & 1b: 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,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );/* 2a: Program RC6 thresholds.*/ I915_WRITE (GEN6_RC6_WAKE_RATE_LIMIT ,40 <<16 );
@@ -4747,7 +4746,7 @@ static void cherryview_enable_rps(struct drm_device *dev)valleyview_set_rps (dev_priv->dev, dev_priv->rps.efficient_freq); -gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); }static void valleyview_enable_rps (struct drm_device *dev)
@@ -4768,7 +4767,7 @@ static void valleyview_enable_rps(struct drm_device *dev) }/* If VLV, Forcewake all wells, else re-direct to regular path */ -gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );I915_WRITE (GEN6_RP_UP_THRESHOLD ,59400 );I915_WRITE (GEN6_RP_DOWN_THRESHOLD ,245000 );
@@ -4828,7 +4827,7 @@ static void valleyview_enable_rps(struct drm_device *dev)valleyview_set_rps (dev_priv->dev, dev_priv->rps.efficient_freq); -gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); }void ironlake_teardown_rc6 (struct drm_device *dev)
drivers/gpu/drm/i915/intel_ringbuffer.c +2 -2
@@ -536,7 +536,7 @@ static int init_ring_common(struct intel_engine_cs *ring)struct drm_i915_gem_object *obj = ringbuf->obj;int ret =0 ; -gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );if (!stop_ring (ring)) {/* G45 ring initialization often fails to reset head to zero */
@@ -608,7 +608,7 @@ static int init_ring_common(struct intel_engine_cs *ring)memset (&ring->hangcheck,0 ,sizeof (ring->hangcheck)); out: -gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );return ret; }
drivers/gpu/drm/i915/intel_uncore.c +11 -11
@@ -232,7 +232,7 @@ static int __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv)return ret; } -static void gen6_force_wake_timer (unsigned long arg) +static void intel_uncore_fw_release_timer (unsigned long arg) {struct intel_uncore_forcewake_domain *domain = (void *)arg;unsigned long irqflags;
@@ -268,7 +268,7 @@ void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore)if (del_timer_sync (&domain->timer) ==0 )continue ; -gen6_force_wake_timer ((unsigned long )domain); +intel_uncore_fw_release_timer ((unsigned long )domain); }spin_lock_irqsave (&dev_priv->uncore.lock, irqflags);
@@ -312,7 +312,7 @@ void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore) }if (!restore) -assert_force_wake_inactive (dev_priv); +assert_forcewakes_inactive (dev_priv);spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); }
@@ -360,10 +360,10 @@ void intel_uncore_sanitize(struct drm_device *dev)* Generally this is called implicitly by the register read function. However, * if some sequence requires the GT to not power down then this function should * be called at the beginning of the sequence followed by a call to -* gen6_gt_force_wake_put() at the end of the sequence. +* intel_uncore_forcewake_put() at the end of the sequence. */ -void gen6_gt_force_wake_get (struct drm_i915_private *dev_priv, -unsigned fw_domains) +void intel_uncore_forcewake_get (struct drm_i915_private *dev_priv, +unsigned fw_domains) {unsigned long irqflags;struct intel_uncore_forcewake_domain *domain;
@@ -390,10 +390,10 @@ void gen6_gt_force_wake_get(struct drm_i915_private *dev_priv, }/* -* see gen6_gt_force_wake_get() +* see intel_uncore_forcewake_get() */ -void gen6_gt_force_wake_put (struct drm_i915_private *dev_priv, -unsigned fw_domains) +void intel_uncore_forcewake_put (struct drm_i915_private *dev_priv, +unsigned fw_domains) {unsigned long irqflags;struct intel_uncore_forcewake_domain *domain;
@@ -420,7 +420,7 @@ void gen6_gt_force_wake_put(struct drm_i915_private *dev_priv,spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); } -void assert_force_wake_inactive (struct drm_i915_private *dev_priv) +void assert_forcewakes_inactive (struct drm_i915_private *dev_priv) {struct intel_uncore_forcewake_domain *domain;int id;
@@ -962,7 +962,7 @@ static void fw_domain_init(struct drm_i915_private *dev_priv, d->i915 = dev_priv; d->id = domain_id; -setup_timer (&d->timer, gen6_force_wake_timer, (unsigned long )d); +setup_timer (&d->timer, intel_uncore_fw_release_timer, (unsigned long )d); dev_priv->uncore.fw_domains |= (1 << domain_id); }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/9 drm/i915: Enum forcewake domains and domain identifiers
In reply to Mika KuoppalaMake the domains and domain identifiers enums. To emphasize the difference in order to avoid mistakes.
v2: s/fw_domain/forcewake_domain (Jani)
v3: rebase
--- drivers/gpu/drm/i915/i915_drv.h | 45 ++++++++++++++++++----------------- drivers/gpu/drm/i915/intel_uncore.c | 47 ++++++++++++++++++++----------------- 2 files changed, 49 insertions(+), 43 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +24 -21
@@ -574,11 +574,28 @@ struct drm_i915_display_funcs {void (*enable_backlight)(struct intel_connector *connector); }; +enum forcewake_domain_id { +FW_DOMAIN_ID_RENDER =0 , +FW_DOMAIN_ID_BLITTER , +FW_DOMAIN_ID_MEDIA , + +FW_DOMAIN_ID_COUNT +}; + +enum forcewake_domains { +FORCEWAKE_RENDER = (1 <<FW_DOMAIN_ID_RENDER ), +FORCEWAKE_BLITTER = (1 <<FW_DOMAIN_ID_BLITTER ), +FORCEWAKE_MEDIA = (1 <<FW_DOMAIN_ID_MEDIA ), +FORCEWAKE_ALL = (FORCEWAKE_RENDER | +FORCEWAKE_BLITTER | +FORCEWAKE_MEDIA ) +}; +struct intel_uncore_funcs {void (*force_wake_get)(struct drm_i915_private *dev_priv, -int fw_engine); +enum forcewake_domains domains);void (*force_wake_put)(struct drm_i915_private *dev_priv, -int fw_engine); +enum forcewake_domains domains);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);
@@ -595,25 +612,17 @@ struct intel_uncore_funcs { uint64_t val, bool trace); }; -enum { -FW_DOMAIN_ID_RENDER =0 , -FW_DOMAIN_ID_BLITTER , -FW_DOMAIN_ID_MEDIA , - -FW_DOMAIN_ID_COUNT -}; -struct intel_uncore {spinlock_t lock;/** lock is also taken in irq contexts. */ struct intel_uncore_funcs funcs;unsigned fifo_count; -unsigned fw_domains; +enum forcewake_domains fw_domains;struct intel_uncore_forcewake_domain {struct drm_i915_private *i915; -int id; +enum forcewake_domain_id id;unsigned wake_count;struct timer_list timer;u32 reg_set;
@@ -623,12 +632,6 @@ struct intel_uncore {u32 reg_post;u32 val_reset; } fw_domain[FW_DOMAIN_ID_COUNT ]; -#define FORCEWAKE_RENDER (1 << FW_DOMAIN_ID_RENDER) -#define FORCEWAKE_BLITTER (1 << FW_DOMAIN_ID_BLITTER) -#define FORCEWAKE_MEDIA (1 << FW_DOMAIN_ID_MEDIA) -#define FORCEWAKE_ALL (FORCEWAKE_RENDER | \ - FORCEWAKE_BLITTER | \ - FORCEWAKE_MEDIA) };/* Iterate over initialised fw domains */
@@ -2506,11 +2509,11 @@ extern void intel_uncore_init(struct drm_device *dev);extern void intel_uncore_check_errors (struct drm_device *dev);extern void intel_uncore_fini (struct drm_device *dev);extern void intel_uncore_forcewake_reset (struct drm_device *dev,bool restore); -const char *intel_uncore_forcewake_domain_to_str (const int domain_id); +const char *intel_uncore_forcewake_domain_to_str (const enum forcewake_domain_id id);void intel_uncore_forcewake_get (struct drm_i915_private *dev_priv, -unsigned fw_domains); +enum forcewake_domains domains);void intel_uncore_forcewake_put (struct drm_i915_private *dev_priv, -unsigned fw_domains); +enum forcewake_domains domains);void assert_forcewakes_inactive (struct drm_i915_private *dev_priv);void
drivers/gpu/drm/i915/intel_uncore.c +25 -22
152 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/9 drm/i915: Rename i915_gen6_forcewake_count_info
In reply to Mika KuoppalaThere are multiple forcewake domains in newer architectures. Rename 'i915_gen6_forcewake_count_info' debugfs entry to 'i915_forcewake_domains' to reflect this.
--- drivers/gpu/drm/i915/i915_debugfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +3 -3
@@ -1288,7 +1288,7 @@ static int ironlake_drpc_info(struct seq_file *m)return 0 ; } -static int i915_gen6_forcewake_count_info (struct seq_file *m,void *data) +static int i915_forcewake_domains (struct seq_file *m,void *data) {struct drm_info_node *node = m->private;struct drm_device *dev = node->minor->dev;
@@ -1344,7 +1344,7 @@ static int vlv_drpc_info(struct seq_file *m)seq_printf (m,"Media RC6 residency since boot: %u\n" ,I915_READ (VLV_GT_MEDIA_RC6 )); -return i915_gen6_forcewake_count_info (m,NULL ); +return i915_forcewake_domains (m,NULL ); }static int gen6_drpc_info (struct seq_file *m)
@@ -4406,7 +4406,7 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_context_status", i915_context_status, 0}, {"i915_dump_lrc", i915_dump_lrc, 0}, {"i915_execlists", i915_execlists, 0}, - {"i915_gen6_forcewake_count", i915_gen6_forcewake_count_info, 0}, + {"i915_forcewake_domains", i915_forcewake_domains, 0}, {"i915_swizzle_info", i915_swizzle_info, 0}, {"i915_ppgtt_info", i915_ppgtt_info, 0}, {"i915_llc", i915_llc, 0},
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 9/9] drm/i915: Rename i915_gen6_forcewake_count_info
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -1 364/364 363/364 ILK +5 360/366 365/366 SNB -19 448/450 429/450 IVB 497/498 497/498 BYT 289/289 289/289 HSW -89 563/564 474/564 BDW 417/417 417/417 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied *PNV igt_gem_fence_thrash_bo-write-verify-none PASS(2, M23M7) FAIL(1, M7) ILK igt_drv_suspend_fence-restore-untiled DMESG_WARN(1, M26)PASS(11, M37M26) PASS(1, M37) ILK igt_kms_flip_bcs-flip-vs-modeset-interruptible DMESG_WARN(1, M26)PASS(11, M37M26) PASS(1, M37) ILK igt_kms_flip_busy-flip-interruptible DMESG_WARN(2, M26)PASS(9, M37M26) PASS(1, M37) ILK igt_kms_flip_flip-vs-rmfb-interruptible DMESG_WARN(1, M26)PASS(11, M37M26) PASS(1, M37) ILK igt_kms_flip_rcs-flip-vs-dpms DMESG_WARN(1, M26)PASS(10, M37M26) PASS(1, M37) *SNB igt_pm_rpm_cursor PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_cursor-dpms PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_debugfs-forcewake-user PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_dpms-mode-unset-non-lpsp PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_dpms-non-lpsp PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_drm-resources-equal PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_fences PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_fences-dpms PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_gem-execbuf PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_gem-idle PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_gem-mmap-cpu PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_gem-mmap-gtt PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_gem-pread PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_i2c PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_modeset-non-lpsp PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_modeset-non-lpsp-stress-no-wait PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_pci-d3-state PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_reg-read-ioctl PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_rte PASS(2, M35) DMESG_WARN(1, M35) *HSW igt_gem_pwrite_pread_snooped-copy-performance PASS(2, M40) DMESG_WARN(1, M40) HSW igt_gem_reloc_overflow_source-offset-big-reloc-cpu FAIL(1, M40)PASS(1, M40) FAIL(1, M40) HSW igt_gem_reloc_overflow_source-offset-big-reloc-gtt FAIL(1, M40)PASS(1, M40) FAIL(1, M40) HSW igt_gem_reloc_overflow_source-offset-negative-reloc-cpu FAIL(1, M40)PASS(1, M40) FAIL(1, M40) HSW igt_gem_reloc_overflow_source-offset-negative-reloc-gtt FAIL(1, M40)PASS(1, M40) FAIL(1, M40) HSW igt_gem_reloc_overflow_source-offset-unaligned-reloc-cpu FAIL(1, M40)PASS(1, M40) FAIL(1, M40) HSW igt_gem_reloc_overflow_source-offset-unaligned-reloc-gtt FAIL(1, M40)PASS(1, M40) FAIL(1, M40) *HSW igt_kms_flip_vblank-vs-dpms-rpm PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_pipe_crc_basic_read-crc-pipe-A PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_pipe_crc_basic_read-crc-pipe-A-frame-sequence PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_pipe_crc_basic_read-crc-pipe-B PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_pipe_crc_basic_read-crc-pipe-B-frame-sequence PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_pipe_crc_basic_read-crc-pipe-C PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_pipe_crc_basic_read-crc-pipe-C-frame-sequence PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-bottom-right-pipe-A-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-bottom-right-pipe-A-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-bottom-right-pipe-B-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-bottom-right-pipe-B-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-bottom-right-pipe-C-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-bottom-right-pipe-C-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-top-left-pipe-A-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-top-left-pipe-A-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-top-left-pipe-B-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-top-left-pipe-B-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-top-left-pipe-C-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-top-left-pipe-C-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-covered-pipe-A-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-covered-pipe-A-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-covered-pipe-B-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-covered-pipe-C-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-covered-pipe-C-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-hole-pipe-A-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-hole-pipe-A-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-hole-pipe-B-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-hole-pipe-B-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-hole-pipe-C-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-hole-pipe-C-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_lpsp_non-edp PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_lpsp_screens-disabled PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_cursor PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_cursor-dpms PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_debugfs-forcewake-user PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_debugfs-read PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_dpms-mode-unset-non-lpsp PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_dpms-non-lpsp PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_drm-resources-equal PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_fences PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_fences-dpms PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_gem-execbuf PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_gem-idle PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_gem-mmap-cpu PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_gem-mmap-gtt PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_gem-pread PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_i2c PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_modeset-non-lpsp PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_modeset-non-lpsp-stress-no-wait PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_pci-d3-state PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_reg-read-ioctl PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_rte PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_sysfs-read PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_gem_partial_pwrite_pread_reads-snoop PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_absolute-wf_vblank PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_absolute-wf_vblank-interruptible PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_blocking-absolute-wf_vblank PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_blocking-absolute-wf_vblank-interruptible PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_blocking-wf_vblank PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_busy-flip PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_busy-flip-interruptible PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_dpms-off-confusion PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_dpms-off-confusion-interruptible PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_flip-vs-absolute-wf_vblank PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_flip-vs-absolute-wf_vblank-interruptible PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_flip-vs-blocking-wf-vblank PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_flip-vs-panning PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_flip-vs-panning-interruptible PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_flip-vs-rmfb PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_flip-vs-rmfb-interruptible PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_flip-vs-wf_vblank PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_flip-vs-wf_vblank-interruptible PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_plain-flip PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_plain-flip-fb-recreate PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_plain-flip-fb-recreate-interruptible PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_plain-flip-interruptible PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_plain-flip-ts-check PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_plain-flip-ts-check-interruptible PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_wf_vblank PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_wf_vblank-interruptible PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_wf_vblank-ts-check PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_wf_vblank-ts-check-interruptible PASS(1, M40) DMESG_WARN(1, M40)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 9/9] drm/i915: Rename i915_gen6_forcewake_count_info
Quoted 9 lines · On Tue, Dec 16, 2014 at 11:55:55AM -0800, [email protected] wrote:
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series AppliedPNV -1 364/364 363/364 ILK +5 360/366 365/366 SNB -19 448/450 429/450 IVB 497/498 497/498 BYT 289/289 289/289 HSW -89 563/564 474/564
Ok, this is a bit disturbing ... are all these new dmesg warnings real or is that just prts getting confused? I don't have the detailed result link so can't check myself. Maybe we should add that to the summary so that at least intel people can have a look.
-Daniel
Quoted 122 lines
BDW 417/417 417/417
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied*PNV igt_gem_fence_thrash_bo-write-verify-none PASS(2, M23M7) FAIL(1, M7) ILK igt_drv_suspend_fence-restore-untiled DMESG_WARN(1, M26)PASS(11, M37M26) PASS(1, M37) ILK igt_kms_flip_bcs-flip-vs-modeset-interruptible DMESG_WARN(1, M26)PASS(11, M37M26) PASS(1, M37) ILK igt_kms_flip_busy-flip-interruptible DMESG_WARN(2, M26)PASS(9, M37M26) PASS(1, M37) ILK igt_kms_flip_flip-vs-rmfb-interruptible DMESG_WARN(1, M26)PASS(11, M37M26) PASS(1, M37) ILK igt_kms_flip_rcs-flip-vs-dpms DMESG_WARN(1, M26)PASS(10, M37M26) PASS(1, M37) *SNB igt_pm_rpm_cursor PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_cursor-dpms PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_debugfs-forcewake-user PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_dpms-mode-unset-non-lpsp PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_dpms-non-lpsp PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_drm-resources-equal PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_fences PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_fences-dpms PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_gem-execbuf PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_gem-idle PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_gem-mmap-cpu PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_gem-mmap-gtt PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_gem-pread PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_i2c PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_modeset-non-lpsp PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_modeset-non-lpsp-stress-no-wait PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_pci-d3-state PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_reg-read-ioctl PASS(2, M35) DMESG_WARN(1, M35) *SNB igt_pm_rpm_rte PASS(2, M35) DMESG_WARN(1, M35) *HSW igt_gem_pwrite_pread_snooped-copy-performance PASS(2, M40) DMESG_WARN(1, M40) HSW igt_gem_reloc_overflow_source-offset-big-reloc-cpu FAIL(1, M40)PASS(1, M40) FAIL(1, M40) HSW igt_gem_reloc_overflow_source-offset-big-reloc-gtt FAIL(1, M40)PASS(1, M40) FAIL(1, M40) HSW igt_gem_reloc_overflow_source-offset-negative-reloc-cpu FAIL(1, M40)PASS(1, M40) FAIL(1, M40) HSW igt_gem_reloc_overflow_source-offset-negative-reloc-gtt FAIL(1, M40)PASS(1, M40) FAIL(1, M40) HSW igt_gem_reloc_overflow_source-offset-unaligned-reloc-cpu FAIL(1, M40)PASS(1, M40) FAIL(1, M40) HSW igt_gem_reloc_overflow_source-offset-unaligned-reloc-gtt FAIL(1, M40)PASS(1, M40) FAIL(1, M40) *HSW igt_kms_flip_vblank-vs-dpms-rpm PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_pipe_crc_basic_read-crc-pipe-A PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_pipe_crc_basic_read-crc-pipe-A-frame-sequence PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_pipe_crc_basic_read-crc-pipe-B PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_pipe_crc_basic_read-crc-pipe-B-frame-sequence PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_pipe_crc_basic_read-crc-pipe-C PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_pipe_crc_basic_read-crc-pipe-C-frame-sequence PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-bottom-right-pipe-A-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-bottom-right-pipe-A-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-bottom-right-pipe-B-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-bottom-right-pipe-B-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-bottom-right-pipe-C-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-bottom-right-pipe-C-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-top-left-pipe-A-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-top-left-pipe-A-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-top-left-pipe-B-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-top-left-pipe-B-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-top-left-pipe-C-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-panning-top-left-pipe-C-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-covered-pipe-A-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-covered-pipe-A-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-covered-pipe-B-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-covered-pipe-C-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-covered-pipe-C-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-hole-pipe-A-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-hole-pipe-A-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-hole-pipe-B-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-hole-pipe-B-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-hole-pipe-C-plane-1 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_plane_plane-position-hole-pipe-C-plane-2 PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_lpsp_non-edp PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_lpsp_screens-disabled PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_cursor PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_cursor-dpms PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_debugfs-forcewake-user PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_debugfs-read PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_dpms-mode-unset-non-lpsp PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_dpms-non-lpsp PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_drm-resources-equal PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_fences PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_fences-dpms PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_gem-execbuf PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_gem-idle PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_gem-mmap-cpu PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_gem-mmap-gtt PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_gem-pread PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_i2c PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_modeset-non-lpsp PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_modeset-non-lpsp-stress-no-wait PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_pci-d3-state PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_reg-read-ioctl PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_rte PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_pm_rpm_sysfs-read PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_gem_partial_pwrite_pread_reads-snoop PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_absolute-wf_vblank PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_absolute-wf_vblank-interruptible PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_blocking-absolute-wf_vblank PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_blocking-absolute-wf_vblank-interruptible PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_blocking-wf_vblank PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_busy-flip PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_busy-flip-interruptible PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_dpms-off-confusion PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_dpms-off-confusion-interruptible PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_flip-vs-absolute-wf_vblank PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_flip-vs-absolute-wf_vblank-interruptible PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_flip-vs-blocking-wf-vblank PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_flip-vs-panning PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_flip-vs-panning-interruptible PASS(2, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_flip-vs-rmfb PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_flip-vs-rmfb-interruptible PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_flip-vs-wf_vblank PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_flip-vs-wf_vblank-interruptible PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_plain-flip PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_plain-flip-fb-recreate PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_plain-flip-fb-recreate-interruptible PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_plain-flip-interruptible PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_plain-flip-ts-check PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_plain-flip-ts-check-interruptible PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_wf_vblank PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_wf_vblank-interruptible PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_wf_vblank-ts-check PASS(1, M40) DMESG_WARN(1, M40) *HSW igt_kms_flip_wf_vblank-ts-check-interruptible PASS(1, M40) DMESG_WARN(1, M40)Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx