Haswell Forcewake/RC6 v2
Subsystems (2)
cover Haswell Forcewake/RC6 v2
Updates on top of previous series:
- use wait_for_atomic_us for waiting
- simplify haswell/rc6 sequence and do not write bits that are no longer valid (RC6p and RC6pp)
- remove one extra bit in RC6 wake rate programming
- beautify the rc6 workaround
- move the forcewake code into intel_pm at the end of the series
Chris Wilson (2):
drm/i915: Group the GT routines together in both code and vtable drm/i915: Implement w/a for sporadic read failures on waking from rc6
Eugeni Dodonov (7):
drm/i915: support Haswell force waking drm/i915: add RPS configuration for Haswell drm/i915: disable RC6 when disabling rps drm/i915: program RC6 wake rate limits according to docs drm/i915: introduce haswell_init_clock_gating drm/i915: enable RC6 workaround on Haswell drm/i915: move forcewake support into intel_pm
drivers/gpu/drm/i915/i915_dma.c | 2 +- drivers/gpu/drm/i915/i915_drv.c | 138 +------------- drivers/gpu/drm/i915/i915_drv.h | 17 +- drivers/gpu/drm/i915/i915_reg.h | 11 ++ drivers/gpu/drm/i915/intel_display.c | 3 - drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 357 +++++++++++++++++++++++++++++------ 7 files changed, 324 insertions(+), 205 deletions(-)
Signature · 1 line
1.7.11.1
PATCH 1/9 drm/i915: Group the GT routines together in both code and vtable
From: Chris Wilson <[email protected]>
Tidy up the routines for interacting with the GT (in particular the forcewake dance) which are scattered throughout the code in a single structure.
v2: use wait_for_atomic for polling.
--- drivers/gpu/drm/i915/i915_dma.c | 2 +- drivers/gpu/drm/i915/i915_drv.c | 101 ++++++++++++++++++++++------------- drivers/gpu/drm/i915/i915_drv.h | 17 +++--- drivers/gpu/drm/i915/intel_display.c | 3 -- drivers/gpu/drm/i915/intel_pm.c | 30 ----------- 5 files changed, 73 insertions(+), 80 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +1 -1
@@ -1548,6 +1548,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) }intel_irq_init (dev); +intel_gt_init (dev);/* Try to make sure MCHBAR is enabled before poking at it */ intel_setup_mchbar (dev);
@@ -1580,7 +1581,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)if (!IS_I945G (dev) && !IS_I945GM (dev))pci_enable_msi (dev->pdev); -spin_lock_init (&dev_priv->gt_lock);spin_lock_init (&dev_priv->irq_lock);spin_lock_init (&dev_priv->error_lock);spin_lock_init (&dev_priv->rps_lock);
drivers/gpu/drm/i915/i915_drv.c +64 -37
183 lines not on this page · raw message
drivers/gpu/drm/i915/i915_drv.h +8 -9
@@ -262,8 +262,6 @@ struct drm_i915_display_funcs { struct drm_i915_gem_object *obj);int (*update_plane)(struct drm_crtc *crtc,struct drm_framebuffer *fb,int x,int y); -void (*force_wake_get)(struct drm_i915_private *dev_priv); -void (*force_wake_put)(struct drm_i915_private *dev_priv);/* clock updates for mode set */ /* cursor updates */ /* render clock increase/decrease */
@@ -271,6 +269,11 @@ struct drm_i915_display_funcs {/* pll clock increase/decrease */ }; +struct drm_i915_gt_funcs { +void (*force_wake_get)(struct drm_i915_private *dev_priv); +void (*force_wake_put)(struct drm_i915_private *dev_priv); +}; +struct intel_device_info {u8 gen;u8 is_mobile:1 ;
@@ -362,6 +365,8 @@ typedef struct drm_i915_private {int relative_constants_mode;void __iomem *regs; + +struct drm_i915_gt_funcs gt;/** gt_fifo_count and the subsequent register write are synchronized * with dev->struct_mutex. */ unsigned gt_fifo_count;
@@ -1200,6 +1205,7 @@ void i915_hangcheck_elapsed(unsigned long data);void i915_handle_error (struct drm_device *dev,bool wedged);extern void intel_irq_init (struct drm_device *dev); +extern void intel_gt_init (struct drm_device *dev);void i915_error_state_free (struct kref *error_ref);
@@ -1517,13 +1523,6 @@ extern int intel_trans_dp_port_sel(struct drm_crtc *crtc);extern int intel_enable_rc6 (const struct drm_device *dev);extern bool i915_semaphore_is_enabled (struct drm_device *dev); -extern void __gen6_gt_force_wake_get (struct drm_i915_private *dev_priv); -extern void __gen6_gt_force_wake_mt_get (struct drm_i915_private *dev_priv); -extern void __gen6_gt_force_wake_put (struct drm_i915_private *dev_priv); -extern void __gen6_gt_force_wake_mt_put (struct drm_i915_private *dev_priv); - -extern void vlv_force_wake_get (struct drm_i915_private *dev_priv); -extern void vlv_force_wake_put (struct drm_i915_private *dev_priv);/* overlay */ #ifdef CONFIG_DEBUG_FS
drivers/gpu/drm/i915/intel_display.c +0 -3
@@ -7121,9 +7121,6 @@ static void intel_init_display(struct drm_device *dev) dev_priv->display.write_eld = ironlake_write_eld; }else dev_priv->display.update_wm =NULL ; - }else if (IS_VALLEYVIEW (dev)) { - dev_priv->display.force_wake_get = vlv_force_wake_get; - dev_priv->display.force_wake_put = vlv_force_wake_put; }else if (IS_G4X (dev)) { dev_priv->display.write_eld = g4x_write_eld; }
drivers/gpu/drm/i915/intel_pm.c +0 -30
@@ -3763,34 +3763,6 @@ void intel_init_pm(struct drm_device *dev)/* For FIFO watermark updates */ if (HAS_PCH_SPLIT (dev)) { - dev_priv->display.force_wake_get = __gen6_gt_force_wake_get; - dev_priv->display.force_wake_put = __gen6_gt_force_wake_put; - -/* IVB configs may use multi-threaded forcewake */ -if (IS_IVYBRIDGE (dev) ||IS_HASWELL (dev)) { -u32 ecobus; - -/* A small trick here - if the bios hasn't configured MT forcewake, -* and if the device is in RC6, then force_wake_mt_get will not wake -* the device and the ECOBUS read will return zero. Which will be -* (correctly) interpreted by the test below as MT forcewake being -* disabled. -*/ -mutex_lock (&dev->struct_mutex); -__gen6_gt_force_wake_mt_get (dev_priv); - ecobus =I915_READ_NOTRACE (ECOBUS ); -__gen6_gt_force_wake_mt_put (dev_priv); -mutex_unlock (&dev->struct_mutex); - -if (ecobus &FORCEWAKE_MT_ENABLE ) { -DRM_DEBUG_KMS ("Using MT version of forcewake\n" ); - dev_priv->display.force_wake_get = - __gen6_gt_force_wake_mt_get; - dev_priv->display.force_wake_put = - __gen6_gt_force_wake_mt_put; - } - } -if (HAS_PCH_IBX (dev)) dev_priv->display.init_pch_clock_gating = ibx_init_clock_gating;else if (HAS_PCH_CPT (dev))
@@ -3846,8 +3818,6 @@ void intel_init_pm(struct drm_device *dev) dev_priv->display.update_wm = valleyview_update_wm; dev_priv->display.init_clock_gating = valleyview_init_clock_gating; - dev_priv->display.force_wake_get = vlv_force_wake_get; - dev_priv->display.force_wake_put = vlv_force_wake_put; } else if (IS_PINEVIEW(dev)) { if (!intel_get_cxsr_latency(IS_PINEVIEW_G(dev), dev_priv->is_ddr3,
Signature · 1 line
1.7.11.1
PATCH 1/9 drm/i915: Group the GT routines together in both code and vtable
From: Chris Wilson <[email protected]>
Tidy up the routines for interacting with the GT (in particular the forcewake dance) which are scattered throughout the code in a single structure.
v2: use wait_for_atomic for polling.
v3: *really* use wait_for_atomic for polling.
--- drivers/gpu/drm/i915/i915_dma.c | 2 +- drivers/gpu/drm/i915/i915_drv.c | 101 ++++++++++++++++++++++------------- drivers/gpu/drm/i915/i915_drv.h | 17 +++--- drivers/gpu/drm/i915/intel_display.c | 3 -- drivers/gpu/drm/i915/intel_pm.c | 30 ----------- 5 files changed, 73 insertions(+), 80 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +1 -1
@@ -1548,6 +1548,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) }intel_irq_init (dev); +intel_gt_init (dev);/* Try to make sure MCHBAR is enabled before poking at it */ intel_setup_mchbar (dev);
@@ -1580,7 +1581,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)if (!IS_I945G (dev) && !IS_I945GM (dev))pci_enable_msi (dev->pdev); -spin_lock_init (&dev_priv->gt_lock);spin_lock_init (&dev_priv->irq_lock);spin_lock_init (&dev_priv->error_lock);spin_lock_init (&dev_priv->rps_lock);
drivers/gpu/drm/i915/i915_drv.c +64 -37
183 lines not on this page · raw message
drivers/gpu/drm/i915/i915_drv.h +8 -9
@@ -262,8 +262,6 @@ struct drm_i915_display_funcs { struct drm_i915_gem_object *obj);int (*update_plane)(struct drm_crtc *crtc,struct drm_framebuffer *fb,int x,int y); -void (*force_wake_get)(struct drm_i915_private *dev_priv); -void (*force_wake_put)(struct drm_i915_private *dev_priv);/* clock updates for mode set */ /* cursor updates */ /* render clock increase/decrease */
@@ -271,6 +269,11 @@ struct drm_i915_display_funcs {/* pll clock increase/decrease */ }; +struct drm_i915_gt_funcs { +void (*force_wake_get)(struct drm_i915_private *dev_priv); +void (*force_wake_put)(struct drm_i915_private *dev_priv); +}; +struct intel_device_info {u8 gen;u8 is_mobile:1 ;
@@ -362,6 +365,8 @@ typedef struct drm_i915_private {int relative_constants_mode;void __iomem *regs; + +struct drm_i915_gt_funcs gt;/** gt_fifo_count and the subsequent register write are synchronized * with dev->struct_mutex. */ unsigned gt_fifo_count;
@@ -1200,6 +1205,7 @@ void i915_hangcheck_elapsed(unsigned long data);void i915_handle_error (struct drm_device *dev,bool wedged);extern void intel_irq_init (struct drm_device *dev); +extern void intel_gt_init (struct drm_device *dev);void i915_error_state_free (struct kref *error_ref);
@@ -1517,13 +1523,6 @@ extern int intel_trans_dp_port_sel(struct drm_crtc *crtc);extern int intel_enable_rc6 (const struct drm_device *dev);extern bool i915_semaphore_is_enabled (struct drm_device *dev); -extern void __gen6_gt_force_wake_get (struct drm_i915_private *dev_priv); -extern void __gen6_gt_force_wake_mt_get (struct drm_i915_private *dev_priv); -extern void __gen6_gt_force_wake_put (struct drm_i915_private *dev_priv); -extern void __gen6_gt_force_wake_mt_put (struct drm_i915_private *dev_priv); - -extern void vlv_force_wake_get (struct drm_i915_private *dev_priv); -extern void vlv_force_wake_put (struct drm_i915_private *dev_priv);/* overlay */ #ifdef CONFIG_DEBUG_FS
drivers/gpu/drm/i915/intel_display.c +0 -3
@@ -7121,9 +7121,6 @@ static void intel_init_display(struct drm_device *dev) dev_priv->display.write_eld = ironlake_write_eld; }else dev_priv->display.update_wm =NULL ; - }else if (IS_VALLEYVIEW (dev)) { - dev_priv->display.force_wake_get = vlv_force_wake_get; - dev_priv->display.force_wake_put = vlv_force_wake_put; }else if (IS_G4X (dev)) { dev_priv->display.write_eld = g4x_write_eld; }
drivers/gpu/drm/i915/intel_pm.c +0 -30
@@ -3763,34 +3763,6 @@ void intel_init_pm(struct drm_device *dev)/* For FIFO watermark updates */ if (HAS_PCH_SPLIT (dev)) { - dev_priv->display.force_wake_get = __gen6_gt_force_wake_get; - dev_priv->display.force_wake_put = __gen6_gt_force_wake_put; - -/* IVB configs may use multi-threaded forcewake */ -if (IS_IVYBRIDGE (dev) ||IS_HASWELL (dev)) { -u32 ecobus; - -/* A small trick here - if the bios hasn't configured MT forcewake, -* and if the device is in RC6, then force_wake_mt_get will not wake -* the device and the ECOBUS read will return zero. Which will be -* (correctly) interpreted by the test below as MT forcewake being -* disabled. -*/ -mutex_lock (&dev->struct_mutex); -__gen6_gt_force_wake_mt_get (dev_priv); - ecobus =I915_READ_NOTRACE (ECOBUS ); -__gen6_gt_force_wake_mt_put (dev_priv); -mutex_unlock (&dev->struct_mutex); - -if (ecobus &FORCEWAKE_MT_ENABLE ) { -DRM_DEBUG_KMS ("Using MT version of forcewake\n" ); - dev_priv->display.force_wake_get = - __gen6_gt_force_wake_mt_get; - dev_priv->display.force_wake_put = - __gen6_gt_force_wake_mt_put; - } - } -if (HAS_PCH_IBX (dev)) dev_priv->display.init_pch_clock_gating = ibx_init_clock_gating;else if (HAS_PCH_CPT (dev))
@@ -3846,8 +3818,6 @@ void intel_init_pm(struct drm_device *dev) dev_priv->display.update_wm = valleyview_update_wm; dev_priv->display.init_clock_gating = valleyview_init_clock_gating; - dev_priv->display.force_wake_get = vlv_force_wake_get; - dev_priv->display.force_wake_put = vlv_force_wake_put; } else if (IS_PINEVIEW(dev)) { if (!intel_get_cxsr_latency(IS_PINEVIEW_G(dev), dev_priv->is_ddr3,
Signature · 1 line
1.7.11.1
PATCH 2/9 drm/i915: Implement w/a for sporadic read failures on waking from rc6
In reply to Eugeni DodonovFrom: Chris Wilson <[email protected]>
As a w/a to prevent reads sporadically returning 0, we need to wait for the GT thread to return to TC0 before proceeding to read the registers.
v2: adapt for Haswell changes (Eugeni).
v3: use wait_for_atomic_us for thread status polling.
References: https://bugs.freedesktop.org/show_bug.cgi?id=50243
--- drivers/gpu/drm/i915/i915_drv.c | 22 ++++++++++++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 4 ++++ 2 files changed, 26 insertions(+)
drivers/gpu/drm/i915/i915_drv.c +22 -0
@@ -433,6 +433,22 @@ bool i915_semaphore_is_enabled(struct drm_device *dev)return 1 ; } +static void __gen6_gt_wait_for_thread_c0 (struct drm_i915_private *dev_priv) +{ +u32 gt_thread_status_mask; + +if (IS_HASWELL (dev_priv->dev)) + gt_thread_status_mask =GEN6_GT_THREAD_STATUS_CORE_MASK_HSW ; +else + gt_thread_status_mask =GEN6_GT_THREAD_STATUS_CORE_MASK ; + +/* w/a for a sporadic read returning 0 by waiting for the GT +* thread to wake up. +*/ +if (wait_for_atomic_us ((I915_READ_NOTRACE (GEN6_GT_THREAD_STATUS_REG ) & gt_thread_status_mask),500 )) +DRM_ERROR ("GT thread status wait timed out\n" ); +} +static void __gen6_gt_force_wake_get (struct drm_i915_private *dev_priv) {if (wait_for_atomic_us ((I915_READ_NOTRACE (FORCEWAKE_ACK ) &1 ),500 ))
@@ -442,6 +458,8 @@ static void __gen6_gt_force_wake_get(struct drm_i915_private *dev_priv)if (wait_for_atomic_us ((I915_READ_NOTRACE (FORCEWAKE_ACK ) &1 ) ==0 ,500 ))DRM_ERROR ("Force wake wait timed out\n" ); + +__gen6_gt_wait_for_thread_c0 (dev_priv); }static void __gen6_gt_force_wake_mt_get (struct drm_i915_private *dev_priv)
@@ -453,6 +471,8 @@ static void __gen6_gt_force_wake_mt_get(struct drm_i915_private *dev_priv)if (wait_for_atomic_us ((I915_READ_NOTRACE (FORCEWAKE_MT_ACK ) &1 ) ==0 ,500 ))DRM_ERROR ("Force wake wait timed out\n" ); + +__gen6_gt_wait_for_thread_c0 (dev_priv); }/*
@@ -538,6 +558,8 @@ static void vlv_force_wake_get(struct drm_i915_private *dev_priv)if (wait_for_atomic_us ((I915_READ_NOTRACE (FORCEWAKE_ACK_VLV ) &1 ) ==0 ,500 ))DRM_ERROR ("Force wake wait timed out\n" ); + +__gen6_gt_wait_for_thread_c0 (dev_priv); }static void vlv_force_wake_put (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -1458,6 +1458,10 @@#define DDRMPLL1 0X12c20#define PEG_BAND_GAP_DATA 0x14d68 +#define GEN6_GT_THREAD_STATUS_REG 0x13805c +#define GEN6_GT_THREAD_STATUS_CORE_MASK 0x7 +#define GEN6_GT_THREAD_STATUS_CORE_MASK_HSW (0x7 | (0x07 << 16)) +#define GEN6_GT_PERF_STATUS 0x145948#define GEN6_RP_STATE_LIMITS 0x145994#define GEN6_RP_STATE_CAP 0x145998
Signature · 1 line
1.7.11.1
PATCH 2/9 drm/i915: Implement w/a for sporadic read failures on waking from rc6
From: Chris Wilson <[email protected]>
As a w/a to prevent reads sporadically returning 0, we need to wait for the GT thread to return to TC0 before proceeding to read the registers.
v2: adapt for Haswell changes (Eugeni).
v3: use wait_for_atomic_us for thread status polling.
v3: *really* use wait_for_atomic for polling.
References: https://bugs.freedesktop.org/show_bug.cgi?id=50243
--- drivers/gpu/drm/i915/i915_drv.c | 22 ++++++++++++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 4 ++++ 2 files changed, 26 insertions(+)
drivers/gpu/drm/i915/i915_drv.c +22 -0
@@ -433,6 +433,22 @@ bool i915_semaphore_is_enabled(struct drm_device *dev)return 1 ; } +static void __gen6_gt_wait_for_thread_c0 (struct drm_i915_private *dev_priv) +{ +u32 gt_thread_status_mask; + +if (IS_HASWELL (dev_priv->dev)) + gt_thread_status_mask =GEN6_GT_THREAD_STATUS_CORE_MASK_HSW ; +else + gt_thread_status_mask =GEN6_GT_THREAD_STATUS_CORE_MASK ; + +/* w/a for a sporadic read returning 0 by waiting for the GT +* thread to wake up. +*/ +if (wait_for_atomic_us ((I915_READ_NOTRACE (GEN6_GT_THREAD_STATUS_REG ) & gt_thread_status_mask) ==0 ,500 )) +DRM_ERROR ("GT thread status wait timed out\n" ); +} +static void __gen6_gt_force_wake_get (struct drm_i915_private *dev_priv) {if (wait_for_atomic_us ((I915_READ_NOTRACE (FORCEWAKE_ACK ) &1 ) ==0 ,500 ))
@@ -442,6 +458,8 @@ static void __gen6_gt_force_wake_get(struct drm_i915_private *dev_priv)if (wait_for_atomic_us ((I915_READ_NOTRACE (FORCEWAKE_ACK ) &1 ),500 ))DRM_ERROR ("Force wake wait timed out\n" ); + +__gen6_gt_wait_for_thread_c0 (dev_priv); }static void __gen6_gt_force_wake_mt_get (struct drm_i915_private *dev_priv)
@@ -453,6 +471,8 @@ static void __gen6_gt_force_wake_mt_get(struct drm_i915_private *dev_priv)if (wait_for_atomic_us ((I915_READ_NOTRACE (FORCEWAKE_MT_ACK ) &1 ),500 ))DRM_ERROR ("Force wake wait timed out\n" ); + +__gen6_gt_wait_for_thread_c0 (dev_priv); }/*
@@ -538,6 +558,8 @@ static void vlv_force_wake_get(struct drm_i915_private *dev_priv)if (wait_for_atomic_us ((I915_READ_NOTRACE (FORCEWAKE_ACK_VLV ) &1 ),500 ))DRM_ERROR ("Force wake wait timed out\n" ); + +__gen6_gt_wait_for_thread_c0 (dev_priv); }static void vlv_force_wake_put (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -1458,6 +1458,10 @@#define DDRMPLL1 0X12c20#define PEG_BAND_GAP_DATA 0x14d68 +#define GEN6_GT_THREAD_STATUS_REG 0x13805c +#define GEN6_GT_THREAD_STATUS_CORE_MASK 0x7 +#define GEN6_GT_THREAD_STATUS_CORE_MASK_HSW (0x7 | (0x07 << 16)) +#define GEN6_GT_PERF_STATUS 0x145948#define GEN6_RP_STATE_LIMITS 0x145994#define GEN6_RP_STATE_CAP 0x145998
Signature · 1 line
1.7.11.1
PATCH 3/9 drm/i915: support Haswell force waking
In reply to Eugeni DodonovThere is a different ACK register for force wake on Haswell, so account for that.
--- drivers/gpu/drm/i915/i915_drv.c | 11 +++++++++-- drivers/gpu/drm/i915/i915_reg.h | 1 + 2 files changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +9 -2
@@ -464,12 +464,19 @@ static void __gen6_gt_force_wake_get(struct drm_i915_private *dev_priv)static void __gen6_gt_force_wake_mt_get (struct drm_i915_private *dev_priv) { -if (wait_for_atomic_us ((I915_READ_NOTRACE (FORCEWAKE_MT_ACK ) &1 ),500 )) +u32 forcewake_ack; + +if (IS_HASWELL (dev_priv->dev)) + forcewake_ack =FORCEWAKE_ACK_HSW ; +else + forcewake_ack =FORCEWAKE_MT_ACK ; + +if (wait_for_atomic_us ((I915_READ_NOTRACE (forcewake_ack) &1 ),500 ))DRM_ERROR ("Force wake wait timed out\n" );I915_WRITE_NOTRACE (FORCEWAKE_MT ,_MASKED_BIT_ENABLE (1 )); -if (wait_for_atomic_us ((I915_READ_NOTRACE (FORCEWAKE_MT_ACK ) &1 ) ==0 ,500 )) +if (wait_for_atomic_us ((I915_READ_NOTRACE (forcewake_ack) &1 ) ==0 ,500 ))DRM_ERROR ("Force wake wait timed out\n" );__gen6_gt_wait_for_thread_c0 (dev_priv);
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -4095,6 +4095,7 @@#define FORCEWAKE 0xA18C#define FORCEWAKE_VLV 0x1300b0#define FORCEWAKE_ACK_VLV 0x1300b4 +#define FORCEWAKE_ACK_HSW 0x130044#define FORCEWAKE_ACK 0x130090#define FORCEWAKE_MT 0xa188/* multi-threaded */ #define FORCEWAKE_MT_ACK 0x130040
Signature · 1 line
1.7.11.1
PATCH 3/9 drm/i915: support Haswell force waking
There is a different ACK register for force wake on Haswell, so account for that.
--- drivers/gpu/drm/i915/i915_drv.c | 7 +++++++ drivers/gpu/drm/i915/i915_reg.h | 1 + 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_drv.c +7 -0
@@ -464,6 +464,13 @@ static void __gen6_gt_force_wake_get(struct drm_i915_private *dev_priv)static void __gen6_gt_force_wake_mt_get (struct drm_i915_private *dev_priv) { +u32 forcewake_ack; + +if (IS_HASWELL (dev_priv->dev)) + forcewake_ack =FORCEWAKE_ACK_HSW ; +else + forcewake_ack =FORCEWAKE_MT_ACK ; +if (wait_for_atomic_us ((I915_READ_NOTRACE (FORCEWAKE_MT_ACK ) &1 ) ==0 ,500 ))DRM_ERROR ("Force wake wait timed out\n" );
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -4095,6 +4095,7 @@#define FORCEWAKE 0xA18C#define FORCEWAKE_VLV 0x1300b0#define FORCEWAKE_ACK_VLV 0x1300b4 +#define FORCEWAKE_ACK_HSW 0x130044#define FORCEWAKE_ACK 0x130090#define FORCEWAKE_MT 0xa188/* multi-threaded */ #define FORCEWAKE_MT_ACK 0x130040
Signature · 1 line
1.7.11.1
PATCH 4/9 drm/i915: add RPS configuration for Haswell
In reply to Eugeni DodonovSplit Haswell-specific GT algorithms into its own function.
Note that Haswell only has RC6, so account for that as well.
v2: reuse gen6 routines to simplify the code flow. v2.1.: actually use proper RP controls for HSW.
v2.2: experiments have shown that GEN6_RP_MEDIA_HW_NORMAL_MODE works better indeed, so use it on Haswell as well.
v3: further simplify the rps sequence for Haswell.
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 77 ++++++++++++++++++++++++++--------------- 2 files changed, 51 insertions(+), 27 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -4156,6 +4156,7 @@#define GEN6_RP_UP_IDLE_MIN (0x1<<3)#define GEN6_RP_UP_BUSY_AVG (0x2<<3)#define GEN6_RP_UP_BUSY_CONT (0x4<<3) +#define GEN7_RP_DOWN_IDLE_AVG (0x2<<0)#define GEN6_RP_DOWN_IDLE_CONT (0x1<<0)#define GEN6_RP_UP_THRESHOLD 0xA02C#define GEN6_RP_DOWN_THRESHOLD 0xA030
drivers/gpu/drm/i915/intel_pm.c +50 -27
132 lines not on this page · raw message
Signature · 1 line
1.7.11.1
PATCH 5/9 drm/i915: disable RC6 when disabling rps
In reply to Eugeni DodonovWe weren't disabling RC6 bits when bringing down RPS.
--- drivers/gpu/drm/i915/intel_pm.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/intel_pm.c +1 -0
@@ -2303,6 +2303,7 @@ static void gen6_disable_rps(struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; +I915_WRITE (GEN6_RC_CONTROL ,0 );I915_WRITE (GEN6_RPNSWREQ ,1 <<31 );I915_WRITE (GEN6_PMINTRMSK ,0xffffffff );I915_WRITE (GEN6_PMIER ,0 );
Signature · 1 line
1.7.11.1
PATCH 6/9 drm/i915: program RC6 wake rate limits according to docs
In reply to Eugeni DodonovAccording to the latest documentation, this additional bit is not needed anymore.
--- drivers/gpu/drm/i915/intel_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -2391,7 +2391,7 @@ static void gen6_enable_rps(struct drm_device *dev)I915_WRITE (GEN6_RC_CONTROL ,0 );I915_WRITE (GEN6_RC1_WAKE_RATE_LIMIT ,1000 <<16 ); -I915_WRITE (GEN6_RC6_WAKE_RATE_LIMIT ,40 <<16 |30 ); +I915_WRITE (GEN6_RC6_WAKE_RATE_LIMIT ,40 <<16 );I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );I915_WRITE (GEN6_RC_IDLE_HYSTERSIS ,25 );
Signature · 1 line
1.7.11.1
PATCH 7/9 drm/i915: introduce haswell_init_clock_gating
In reply to Eugeni DodonovThis is based on Ivy Bridge clock gating for now, but is subject to changes in the future.
--- drivers/gpu/drm/i915/intel_pm.c | 54 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +53 -1
@@ -3425,6 +3425,58 @@ static void gen7_setup_fixed_func_scheduler(struct drm_i915_private *dev_priv)I915_WRITE (GEN7_FF_THREAD_MODE , reg); } +static void haswell_init_clock_gating (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +int pipe; +uint32_t dspclk_gate =VRHUNIT_CLOCK_GATE_DISABLE ; + +I915_WRITE (PCH_DSPCLK_GATE_D , dspclk_gate); + +I915_WRITE (WM3_LP_ILK ,0 ); +I915_WRITE (WM2_LP_ILK ,0 ); +I915_WRITE (WM1_LP_ILK ,0 ); + +/* According to the spec, bit 13 (RCZUNIT) must be set on IVB. +* This implements the WaDisableRCZUnitClockGating workaround. +*/ +I915_WRITE (GEN6_UCGCTL2 ,GEN6_RCZUNIT_CLOCK_GATE_DISABLE ); + +I915_WRITE (ILK_DSPCLK_GATE ,IVB_VRHUNIT_CLK_GATE ); + +I915_WRITE (IVB_CHICKEN3 , +CHICKEN3_DGMG_REQ_OUT_FIX_DISABLE | +CHICKEN3_DGMG_DONE_FIX_DISABLE ); + +/* Apply the WaDisableRHWOOptimizationForRenderHang workaround. */ +I915_WRITE (GEN7_COMMON_SLICE_CHICKEN1 , +GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC ); + +/* WaApplyL3ControlAndL3ChickenMode requires those two on Ivy Bridge */ +I915_WRITE (GEN7_L3CNTLREG1 , +GEN7_WA_FOR_GEN7_L3_CONTROL ); +I915_WRITE (GEN7_L3_CHICKEN_MODE_REGISTER , +GEN7_WA_L3_CHICKEN_MODE ); + +/* This is required by WaCatErrorRejectionIssue */ +I915_WRITE (GEN7_SQ_CHICKEN_MBCUNIT_CONFIG , +I915_READ (GEN7_SQ_CHICKEN_MBCUNIT_CONFIG ) | +GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB ); + +for_each_pipe (pipe) { +I915_WRITE (DSPCNTR (pipe), +I915_READ (DSPCNTR (pipe)) | +DISPPLANE_TRICKLE_FEED_DISABLE ); +intel_flush_display_plane (dev_priv, pipe); + } + +gen7_setup_fixed_func_scheduler (dev_priv); + +/* WaDisable4x2SubspanOptimization */ +I915_WRITE (CACHE_MODE_1 , +_MASKED_BIT_ENABLE (PIXEL_SUBSPAN_COLLECT_OPT_DISABLE )); +} +static void ivybridge_init_clock_gating (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -3834,7 +3886,7 @@ void intel_init_pm(struct drm_device *dev) "Disable CxSR\n"); dev_priv->display.update_wm =NULL ; } - dev_priv->display.init_clock_gating = ivybridge_init_clock_gating; + dev_priv->display.init_clock_gating = haswell_init_clock_gating; dev_priv->display.sanitize_pm = gen6_sanitize_pm; }else dev_priv->display.update_wm =NULL ;
Signature · 1 line
1.7.11.1
PATCH 8/9 drm/i915: enable RC6 workaround on Haswell
In reply to Eugeni DodonovFor Haswell, on some of the early hardware revisions, it is possible to run into issues when RC6 state is enabled and when pipes change state.
v2: add comment saying that this is for early revisions only.
v3: beautify as suggested by Daniel Vetter.
--- drivers/gpu/drm/i915/i915_reg.h | 5 +++++ drivers/gpu/drm/i915/intel_pm.c | 10 ++++++++++ 2 files changed, 15 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +5 -0
@@ -4516,4 +4516,9 @@#define SFUSE_STRAP_DDIC_DETECTED (1<<1)#define SFUSE_STRAP_DDID_DETECTED (1<<0) +#define WM_DBG 0x45280 +#define WM_DBG_DISALLOW_MULTIPLE_LP (1<<0) +#define WM_DBG_DISALLOW_MAXFIFO (1<<1) +#define WM_DBG_DISALLOW_SPRITE (1<<2) +#endif /* _I915_REG_H_ */
drivers/gpu/drm/i915/intel_pm.c +10 -0
@@ -3475,6 +3475,16 @@ static void haswell_init_clock_gating(struct drm_device *dev)/* WaDisable4x2SubspanOptimization */ I915_WRITE (CACHE_MODE_1 ,_MASKED_BIT_ENABLE (PIXEL_SUBSPAN_COLLECT_OPT_DISABLE )); + +/* XXX: This is a workaround for early silicon revisions and should be +* removed later. +*/ +I915_WRITE (WM_DBG , +I915_READ (WM_DBG ) | +WM_DBG_DISALLOW_MULTIPLE_LP | +WM_DBG_DISALLOW_SPRITE | +WM_DBG_DISALLOW_MAXFIFO ); + }static void ivybridge_init_clock_gating (struct drm_device *dev)
Signature · 1 line
1.7.11.1
PATCH 9/9 drm/i915: move forcewake support into intel_pm
In reply to Eugeni DodonovThis moves the force wake support routines into intel_pm and exports the gen6_gt_check_fifodbg routine as we also need it for I915_READ calls.
--- drivers/gpu/drm/i915/i915_drv.c | 184 --------------------------------------- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 183 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 184 insertions(+), 184 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +0 -184
@@ -433,190 +433,6 @@ bool i915_semaphore_is_enabled(struct drm_device *dev)return 1 ; } -static void __gen6_gt_wait_for_thread_c0 (struct drm_i915_private *dev_priv) -{ -u32 gt_thread_status_mask; - -if (IS_HASWELL (dev_priv->dev)) - gt_thread_status_mask =GEN6_GT_THREAD_STATUS_CORE_MASK_HSW ; -else - gt_thread_status_mask =GEN6_GT_THREAD_STATUS_CORE_MASK ; - -/* w/a for a sporadic read returning 0 by waiting for the GT -* thread to wake up. -*/ -if (wait_for_atomic_us ((I915_READ_NOTRACE (GEN6_GT_THREAD_STATUS_REG ) & gt_thread_status_mask),500 )) -DRM_ERROR ("GT thread status wait timed out\n" ); -} - -static void __gen6_gt_force_wake_get (struct drm_i915_private *dev_priv) -{ -if (wait_for_atomic_us ((I915_READ_NOTRACE (FORCEWAKE_ACK ) &1 ),500 )) -DRM_ERROR ("Force wake wait timed out\n" ); - -I915_WRITE_NOTRACE (FORCEWAKE ,1 ); - -if (wait_for_atomic_us ((I915_READ_NOTRACE (FORCEWAKE_ACK ) &1 ) ==0 ,500 )) -DRM_ERROR ("Force wake wait timed out\n" ); - -__gen6_gt_wait_for_thread_c0 (dev_priv); -} - -static void __gen6_gt_force_wake_mt_get (struct drm_i915_private *dev_priv) -{ -u32 forcewake_ack; - -if (IS_HASWELL (dev_priv->dev)) - forcewake_ack =FORCEWAKE_ACK_HSW ; -else - forcewake_ack =FORCEWAKE_MT_ACK ; - -if (wait_for_atomic_us ((I915_READ_NOTRACE (forcewake_ack) &1 ),500 )) -DRM_ERROR ("Force wake wait timed out\n" ); - -I915_WRITE_NOTRACE (FORCEWAKE_MT ,_MASKED_BIT_ENABLE (1 )); - -if (wait_for_atomic_us ((I915_READ_NOTRACE (forcewake_ack) &1 ) ==0 ,500 )) -DRM_ERROR ("Force wake wait timed out\n" ); - -__gen6_gt_wait_for_thread_c0 (dev_priv); -} - -/* -* 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. -*/ -void gen6_gt_force_wake_get (struct drm_i915_private *dev_priv) -{ -unsigned long irqflags; - -spin_lock_irqsave (&dev_priv->gt_lock, irqflags); -if (dev_priv->forcewake_count++ ==0 ) - dev_priv->gt.force_wake_get (dev_priv); -spin_unlock_irqrestore (&dev_priv->gt_lock, irqflags); -} - -static void gen6_gt_check_fifodbg (struct drm_i915_private *dev_priv) -{ -u32 gtfifodbg; - gtfifodbg =I915_READ_NOTRACE (GTFIFODBG ); -if (WARN (gtfifodbg >_FIFO_CPU_ERROR_MASK , -"MMIO read or write has been dropped %x\n" , gtfifodbg)) -I915_WRITE_NOTRACE (GTFIFODBG ,GT_FIFO_CPU_ERROR_MASK ); -} - -static void __gen6_gt_force_wake_put (struct drm_i915_private *dev_priv) -{ -I915_WRITE_NOTRACE (FORCEWAKE ,0 ); -/* The below doubles as a POSTING_READ */ -gen6_gt_check_fifodbg (dev_priv); -} - -static void __gen6_gt_force_wake_mt_put (struct drm_i915_private *dev_priv) -{ -I915_WRITE_NOTRACE (FORCEWAKE_MT ,_MASKED_BIT_DISABLE (1 )); -/* The below doubles as a POSTING_READ */ -gen6_gt_check_fifodbg (dev_priv); -} - -/* -* see gen6_gt_force_wake_get() -*/ -void gen6_gt_force_wake_put (struct drm_i915_private *dev_priv) -{ -unsigned long irqflags; - -spin_lock_irqsave (&dev_priv->gt_lock, irqflags); -if (--dev_priv->forcewake_count ==0 ) - dev_priv->gt.force_wake_put (dev_priv); -spin_unlock_irqrestore (&dev_priv->gt_lock, irqflags); -} - -int __gen6_gt_wait_for_fifo (struct drm_i915_private *dev_priv) -{ -int ret =0 ; - -if (dev_priv->gt_fifo_count <GT_FIFO_NUM_RESERVED_ENTRIES ) { -int loop =500 ; -u32 fifo =I915_READ_NOTRACE (GT_FIFO_FREE_ENTRIES ); -while (fifo <=GT_FIFO_NUM_RESERVED_ENTRIES && loop--) { -udelay (10 ); - fifo =I915_READ_NOTRACE (GT_FIFO_FREE_ENTRIES ); - } -if (WARN_ON (loop <0 && fifo <=GT_FIFO_NUM_RESERVED_ENTRIES )) - ++ret; - dev_priv->gt_fifo_count = fifo; - } - dev_priv->gt_fifo_count--; - -return ret; -} - -static void vlv_force_wake_get (struct drm_i915_private *dev_priv) -{ -/* Already awake? */ -if ((I915_READ (0x130094 ) &0xa1 ) ==0xa1 ) -return ; - -I915_WRITE_NOTRACE (FORCEWAKE_VLV ,0xffffffff ); -POSTING_READ (FORCEWAKE_VLV ); - -if (wait_for_atomic_us ((I915_READ_NOTRACE (FORCEWAKE_ACK_VLV ) &1 ) ==0 ,500 )) -DRM_ERROR ("Force wake wait timed out\n" ); - -__gen6_gt_wait_for_thread_c0 (dev_priv); -} - -static void vlv_force_wake_put (struct drm_i915_private *dev_priv) -{ -I915_WRITE_NOTRACE (FORCEWAKE_VLV ,0xffff0000 ); -/* FIXME: confirm VLV behavior with Punit folks */ -POSTING_READ (FORCEWAKE_VLV ); -} - -void intel_gt_init (struct drm_device *dev) -{ -struct drm_i915_private *dev_priv = dev->dev_private; - -spin_lock_init (&dev_priv->gt_lock); - -if (IS_VALLEYVIEW (dev)) { - dev_priv->gt.force_wake_get = vlv_force_wake_get; - dev_priv->gt.force_wake_put = vlv_force_wake_put; - }else if (INTEL_INFO (dev)->gen >=6 ) { - dev_priv->gt.force_wake_get = __gen6_gt_force_wake_get; - dev_priv->gt.force_wake_put = __gen6_gt_force_wake_put; - -/* IVB configs may use multi-threaded forcewake */ -if (IS_IVYBRIDGE (dev) ||IS_HASWELL (dev)) { -u32 ecobus; - -/* A small trick here - if the bios hasn't configured -* MT forcewake, and if the device is in RC6, then -* force_wake_mt_get will not wake the device and the -* ECOBUS read will return zero. Which will be -* (correctly) interpreted by the test below as MT -* forcewake being disabled. -*/ -mutex_lock (&dev->struct_mutex); -__gen6_gt_force_wake_mt_get (dev_priv); - ecobus =I915_READ_NOTRACE (ECOBUS ); -__gen6_gt_force_wake_mt_put (dev_priv); -mutex_unlock (&dev->struct_mutex); - -if (ecobus &FORCEWAKE_MT_ENABLE ) { -DRM_DEBUG_KMS ("Using MT version of forcewake\n" ); - dev_priv->gt.force_wake_get = - __gen6_gt_force_wake_mt_get; - dev_priv->gt.force_wake_put = - __gen6_gt_force_wake_mt_put; - } - } - } -} -static int i915_drm_freeze (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -533,6 +533,7 @@ extern void intel_gpu_ips_teardown(void);extern void intel_enable_gt_powersave (struct drm_device *dev);extern void intel_disable_gt_powersave (struct drm_device *dev); +extern void gen6_gt_check_fifodbg (struct drm_i915_private *dev_priv);extern void intel_ddi_dpms (struct drm_encoder *encoder,int mode); extern void intel_ddi_mode_set(struct drm_encoder *encoder,
drivers/gpu/drm/i915/intel_pm.c +183 -0
186 lines not on this page · raw message
Signature · 1 line
1.7.11.1
PATCH 9/9 drm/i915: move forcewake support into intel_pm
This moves the force wake support routines into intel_pm and exports the gen6_gt_check_fifodbg routine as we also need it for I915_READ calls.
--- drivers/gpu/drm/i915/i915_drv.c | 184 --------------------------------------- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 184 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 185 insertions(+), 184 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +0 -184
@@ -433,190 +433,6 @@ bool i915_semaphore_is_enabled(struct drm_device *dev)return 1 ; } -static void __gen6_gt_wait_for_thread_c0 (struct drm_i915_private *dev_priv) -{ -u32 gt_thread_status_mask; - -if (IS_HASWELL (dev_priv->dev)) - gt_thread_status_mask =GEN6_GT_THREAD_STATUS_CORE_MASK_HSW ; -else - gt_thread_status_mask =GEN6_GT_THREAD_STATUS_CORE_MASK ; - -/* w/a for a sporadic read returning 0 by waiting for the GT -* thread to wake up. -*/ -if (wait_for_atomic_us ((I915_READ_NOTRACE (GEN6_GT_THREAD_STATUS_REG ) & gt_thread_status_mask) ==0 ,500 )) -DRM_ERROR ("GT thread status wait timed out\n" ); -} - -static void __gen6_gt_force_wake_get (struct drm_i915_private *dev_priv) -{ -if (wait_for_atomic_us ((I915_READ_NOTRACE (FORCEWAKE_ACK ) &1 ) ==0 ,500 )) -DRM_ERROR ("Force wake wait timed out\n" ); - -I915_WRITE_NOTRACE (FORCEWAKE ,1 ); - -if (wait_for_atomic_us ((I915_READ_NOTRACE (FORCEWAKE_ACK ) &1 ),500 )) -DRM_ERROR ("Force wake wait timed out\n" ); - -__gen6_gt_wait_for_thread_c0 (dev_priv); -} - -static void __gen6_gt_force_wake_mt_get (struct drm_i915_private *dev_priv) -{ -u32 forcewake_ack; - -if (IS_HASWELL (dev_priv->dev)) - forcewake_ack =FORCEWAKE_ACK_HSW ; -else - forcewake_ack =FORCEWAKE_MT_ACK ; - -if (wait_for_atomic_us ((I915_READ_NOTRACE (FORCEWAKE_MT_ACK ) &1 ) ==0 ,500 )) -DRM_ERROR ("Force wake wait timed out\n" ); - -I915_WRITE_NOTRACE (FORCEWAKE_MT ,_MASKED_BIT_ENABLE (1 )); - -if (wait_for_atomic_us ((I915_READ_NOTRACE (FORCEWAKE_MT_ACK ) &1 ),500 )) -DRM_ERROR ("Force wake wait timed out\n" ); - -__gen6_gt_wait_for_thread_c0 (dev_priv); -} - -/* -* 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. -*/ -void gen6_gt_force_wake_get (struct drm_i915_private *dev_priv) -{ -unsigned long irqflags; - -spin_lock_irqsave (&dev_priv->gt_lock, irqflags); -if (dev_priv->forcewake_count++ ==0 ) - dev_priv->gt.force_wake_get (dev_priv); -spin_unlock_irqrestore (&dev_priv->gt_lock, irqflags); -} - -static void gen6_gt_check_fifodbg (struct drm_i915_private *dev_priv) -{ -u32 gtfifodbg; - gtfifodbg =I915_READ_NOTRACE (GTFIFODBG ); -if (WARN (gtfifodbg >_FIFO_CPU_ERROR_MASK , -"MMIO read or write has been dropped %x\n" , gtfifodbg)) -I915_WRITE_NOTRACE (GTFIFODBG ,GT_FIFO_CPU_ERROR_MASK ); -} - -static void __gen6_gt_force_wake_put (struct drm_i915_private *dev_priv) -{ -I915_WRITE_NOTRACE (FORCEWAKE ,0 ); -/* The below doubles as a POSTING_READ */ -gen6_gt_check_fifodbg (dev_priv); -} - -static void __gen6_gt_force_wake_mt_put (struct drm_i915_private *dev_priv) -{ -I915_WRITE_NOTRACE (FORCEWAKE_MT ,_MASKED_BIT_DISABLE (1 )); -/* The below doubles as a POSTING_READ */ -gen6_gt_check_fifodbg (dev_priv); -} - -/* -* see gen6_gt_force_wake_get() -*/ -void gen6_gt_force_wake_put (struct drm_i915_private *dev_priv) -{ -unsigned long irqflags; - -spin_lock_irqsave (&dev_priv->gt_lock, irqflags); -if (--dev_priv->forcewake_count ==0 ) - dev_priv->gt.force_wake_put (dev_priv); -spin_unlock_irqrestore (&dev_priv->gt_lock, irqflags); -} - -int __gen6_gt_wait_for_fifo (struct drm_i915_private *dev_priv) -{ -int ret =0 ; - -if (dev_priv->gt_fifo_count <GT_FIFO_NUM_RESERVED_ENTRIES ) { -int loop =500 ; -u32 fifo =I915_READ_NOTRACE (GT_FIFO_FREE_ENTRIES ); -while (fifo <=GT_FIFO_NUM_RESERVED_ENTRIES && loop--) { -udelay (10 ); - fifo =I915_READ_NOTRACE (GT_FIFO_FREE_ENTRIES ); - } -if (WARN_ON (loop <0 && fifo <=GT_FIFO_NUM_RESERVED_ENTRIES )) - ++ret; - dev_priv->gt_fifo_count = fifo; - } - dev_priv->gt_fifo_count--; - -return ret; -} - -static void vlv_force_wake_get (struct drm_i915_private *dev_priv) -{ -/* Already awake? */ -if ((I915_READ (0x130094 ) &0xa1 ) ==0xa1 ) -return ; - -I915_WRITE_NOTRACE (FORCEWAKE_VLV ,0xffffffff ); -POSTING_READ (FORCEWAKE_VLV ); - -if (wait_for_atomic_us ((I915_READ_NOTRACE (FORCEWAKE_ACK_VLV ) &1 ),500 )) -DRM_ERROR ("Force wake wait timed out\n" ); - -__gen6_gt_wait_for_thread_c0 (dev_priv); -} - -static void vlv_force_wake_put (struct drm_i915_private *dev_priv) -{ -I915_WRITE_NOTRACE (FORCEWAKE_VLV ,0xffff0000 ); -/* FIXME: confirm VLV behavior with Punit folks */ -POSTING_READ (FORCEWAKE_VLV ); -} - -void intel_gt_init (struct drm_device *dev) -{ -struct drm_i915_private *dev_priv = dev->dev_private; - -spin_lock_init (&dev_priv->gt_lock); - -if (IS_VALLEYVIEW (dev)) { - dev_priv->gt.force_wake_get = vlv_force_wake_get; - dev_priv->gt.force_wake_put = vlv_force_wake_put; - }else if (INTEL_INFO (dev)->gen >=6 ) { - dev_priv->gt.force_wake_get = __gen6_gt_force_wake_get; - dev_priv->gt.force_wake_put = __gen6_gt_force_wake_put; - -/* IVB configs may use multi-threaded forcewake */ -if (IS_IVYBRIDGE (dev) ||IS_HASWELL (dev)) { -u32 ecobus; - -/* A small trick here - if the bios hasn't configured -* MT forcewake, and if the device is in RC6, then -* force_wake_mt_get will not wake the device and the -* ECOBUS read will return zero. Which will be -* (correctly) interpreted by the test below as MT -* forcewake being disabled. -*/ -mutex_lock (&dev->struct_mutex); -__gen6_gt_force_wake_mt_get (dev_priv); - ecobus =I915_READ_NOTRACE (ECOBUS ); -__gen6_gt_force_wake_mt_put (dev_priv); -mutex_unlock (&dev->struct_mutex); - -if (ecobus &FORCEWAKE_MT_ENABLE ) { -DRM_DEBUG_KMS ("Using MT version of forcewake\n" ); - dev_priv->gt.force_wake_get = - __gen6_gt_force_wake_mt_get; - dev_priv->gt.force_wake_put = - __gen6_gt_force_wake_mt_put; - } - } - } -} -static int i915_drm_freeze (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -533,6 +533,7 @@ extern void intel_gpu_ips_teardown(void);extern void intel_enable_gt_powersave (struct drm_device *dev);extern void intel_disable_gt_powersave (struct drm_device *dev); +extern void gen6_gt_check_fifodbg (struct drm_i915_private *dev_priv);extern void intel_ddi_dpms (struct drm_encoder *encoder,int mode); extern void intel_ddi_mode_set(struct drm_encoder *encoder,
drivers/gpu/drm/i915/intel_pm.c +184 -0
187 lines not on this page · raw message
Signature · 1 line
1.7.11.1