drm/1915: Add ring functions to save/restore context for per-ring reset
Subsystems (2)
PATCH 1/3 drm/1915: Add ring functions to save/restore context for per-ring reset
From: "Siluvery, Arun" <[email protected]>
Instead of full GPU reset, where possible a single ring can be reset individually. This patch adds functions to save ring's current state and it will be restored with the same state after reset. The state comprises of a set of ring specific registers. The actual hang detection and recovery changes are in subsequent patches.
Signed-off-by Siluvery, Arun <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.h | 9 +- drivers/gpu/drm/i915/i915_reg.h | 7 + drivers/gpu/drm/i915/intel_ringbuffer.c | 595 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_ringbuffer.h | 49 +++ drivers/gpu/drm/i915/intel_uncore.c | 25 ++ 5 files changed, 681 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +5 -4
@@ -2423,6 +2423,7 @@ extern void intel_display_print_error_state(struct drm_i915_error_state_buf *e,*/ void gen6_gt_force_wake_get (struct drm_i915_private *dev_priv);void gen6_gt_force_wake_put (struct drm_i915_private *dev_priv); +void gen6_gt_force_wake_restore (struct drm_device *dev);int sandybridge_pcode_read (struct drm_i915_private *dev_priv,u8 mbox,u32 *val);int sandybridge_pcode_write (struct drm_i915_private *dev_priv,u8 mbox,u32 val);
@@ -2456,13 +2457,13 @@ int vlv_freq_opcode(struct drm_i915_private *dev_priv, int val);#define I915_READ16 (reg) dev_priv->uncore.funcs.mmio_readw(dev_priv, (reg), true)#define I915_WRITE16 (reg, val) dev_priv->uncore.funcs.mmio_writew(dev_priv, (reg), (val), true) -#define I915_READ16_NOTRACE (reg) dev_priv->uncore.funcs.mmio_readw(dev_priv, (reg), false) -#define I915_WRITE16_NOTRACE (reg, val) dev_priv->uncore.funcs.mmio_writew(dev_priv, (reg), (val), false) +#define I915_READ16_NOTRACE (reg) dev_priv->uncore.funcs.mmio_readw(dev_priv, (reg), false) +#define I915_WRITE16_NOTRACE (reg, val) dev_priv->uncore.funcs.mmio_writew(dev_priv, (reg), (val), false)#define I915_READ (reg) dev_priv->uncore.funcs.mmio_readl(dev_priv, (reg), true)#define I915_WRITE (reg, val) dev_priv->uncore.funcs.mmio_writel(dev_priv, (reg), (val), true) -#define I915_READ_NOTRACE (reg) dev_priv->uncore.funcs.mmio_readl(dev_priv, (reg), false) -#define I915_WRITE_NOTRACE (reg, val) dev_priv->uncore.funcs.mmio_writel(dev_priv, (reg), (val), false) +#define I915_READ_NOTRACE (reg) dev_priv->uncore.funcs.mmio_readl(dev_priv, (reg), false) +#define I915_WRITE_NOTRACE (reg, val) dev_priv->uncore.funcs.mmio_writel(dev_priv, (reg), (val), false)#define I915_WRITE64 (reg, val) dev_priv->uncore.funcs.mmio_writeq(dev_priv, (reg), (val), true)#define I915_READ64 (reg) dev_priv->uncore.funcs.mmio_readq(dev_priv, (reg), true)
drivers/gpu/drm/i915/i915_reg.h +7 -0
@@ -33,6 +33,7 @@#define _MASKED_BIT_ENABLE (a) (((a) << 16) | (a))#define _MASKED_BIT_DISABLE (a) ((a) << 16) +#define _MASKED_BIT_ENABLE_ALL (a) (0xFFFF0000 | (a))/* PCI config space */
@@ -104,6 +105,7 @@#define GEN6_GRDOM_RENDER (1 << 1)#define GEN6_GRDOM_MEDIA (1 << 2)#define GEN6_GRDOM_BLT (1 << 3) +#define GEN6_GRDOM_VEBOX (1 << 4)#define RING_PP_DIR_BASE (ring) ((ring)->mmio_base+0x228)#define RING_PP_DIR_BASE_READ (ring) ((ring)->mmio_base+0x518)
@@ -642,6 +644,8 @@#define RING_SYNC_0 (base) ((base)+0x40)#define RING_SYNC_1 (base) ((base)+0x44)#define RING_SYNC_2 (base) ((base)+0x48) +#define RING_MI_MODE (base) ((base)+0x9c) +#define RING_UHPTR (base) ((base)+0x134)#define GEN6_RVSYNC (RING_SYNC_0(RENDER_RING_BASE))#define GEN6_RBSYNC (RING_SYNC_1(RENDER_RING_BASE))#define GEN6_RVESYNC (RING_SYNC_2(RENDER_RING_BASE))
@@ -789,6 +793,8 @@#define MI_MODE 0x0209c# define VS_TIMER_DISPATCH (1 << 6) +# define MODE_STOP (1 << 8) +# define MODE_IDLE (1 << 9)# define MI_FLUSH_ENABLE (1 << 12)# define ASYNC_FLIP_PERF_DISABLE (1 << 14)
@@ -799,6 +805,7 @@#define GFX_MODE 0x02520#define GFX_MODE_GEN7 0x0229c#define RING_MODE_GEN7 (ring) ((ring)->mmio_base+0x29c) +#define RING_EXCC_GEN7 (ring) ((ring)->mmio_base+0x028)#define GFX_RUN_LIST_ENABLE (1<<15)#define GFX_TLB_INVALIDATE_ALWAYS (1<<13)#define GFX_SURFACE_FAULT_ENABLE (1<<12)
drivers/gpu/drm/i915/intel_ringbuffer.c +595 -0
649 lines not on this page · raw message
drivers/gpu/drm/i915/intel_ringbuffer.h +49 -0
83 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uncore.c +25 -0
@@ -312,6 +312,31 @@ void gen6_gt_force_wake_put(struct drm_i915_private *dev_priv)spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); } +void gen6_gt_force_wake_restore (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; + +/* Restore the current expected force wake state with the +* hardware. This may be required following a reset. +* +* WARNING: Caller *MUST* hold uncore.lock whilst calling this. +* +* uncore.lock isn't taken in this function to allow the caller the +* flexibility to do other work immediately before/after +* whilst holding the lock */ + +intel_uncore_forcewake_reset (dev); + +/* If reset with a user forcewake, try to restore, otherwise turn it off */ +if (dev_priv->uncore.forcewake_count) + dev_priv->uncore.funcs.force_wake_get (dev_priv); +else + dev_priv->uncore.funcs.force_wake_put (dev_priv); + +/* Restore fifo count */ + dev_priv->uncore.fifo_count =__raw_i915_read32 (dev_priv,GT_FIFO_FREE_ENTRIES ); +} +/* We give fast paths for the really cool registers */ #define NEEDS_FORCE_WAKE (dev_priv, reg) \ ((reg) < 0x40000 && (reg) != FORCEWAKE)
Signature · 1 line
1.8.4