drm/i915: Fix restore of 965 fence regs since the register tracing change.
Subsystems (2)
PATCH 1/1 drm/i915: Fix restore of 965 fence regs since the register tracing change.
We were reading our 64-bit value in I915_READ64 and returning 32 bits of it. The restoration of fence regs at resume then had a zero end value, and the fence had no effect.
--- drivers/gpu/drm/i915/i915_drv.h | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +11 -5
@@ -1244,7 +1244,7 @@ extern void intel_overlay_print_error_state(struct seq_file *m, struct intel_ove#define I915_READ8 (reg) i915_read(dev_priv, (reg), 1)#define I915_WRITE8 (reg, val) i915_write(dev_priv, (reg), (val), 1)#define I915_WRITE64 (reg, val) i915_write(dev_priv, (reg), (val), 8) -#define I915_READ64 (reg) i915_read(dev_priv, (reg), 8) +#define I915_READ64 (reg) i915_read64(dev_priv, (reg))#define I915_READ_NOTRACE (reg) readl(dev_priv->regs + (reg))#define I915_WRITE_NOTRACE (reg, val) writel(val, dev_priv->regs + (reg))
@@ -1256,12 +1256,9 @@ extern void intel_overlay_print_error_state(struct seq_file *m, struct intel_ovestatic inline u32 i915_read (struct drm_i915_private *dev_priv,u32 reg,int len) { -u64 val =0 ; +u32 val =0 ;switch (len) { -case 8 : - val =readq (dev_priv->regs + reg); -break ;case 4 : val =readl (dev_priv->regs + reg);break ;
@@ -1277,6 +1274,15 @@ static inline u32 i915_read(struct drm_i915_private *dev_priv, u32 reg, int len)return val; } +static inline u64 i915_read64 (struct drm_i915_private *dev_priv,u32 reg) +{ +u64 val =readq (dev_priv->regs + reg); + +trace_i915_reg_rw ('R' , reg, val,8 ); + +return val; +} +/* On SNB platform, before reading ring registers forcewake bit * must be set to prevent GT core from power down and stale values being * returned.
Signature · 1 line
1.7.2.3
PATCH 1/1 drm/i915: Fix restore of 965 fence regs since the register tracing change.
We were reading our 64-bit value in I915_READ64 and returning 32 bits of it. The restoration of fence regs at resume then had a zero end value, and the fence had no effect.
Version 2: Split register access functions into per-size versions
Sharing code between different sizes seemed reasonable when we only needed a single copy, but as 64-bit access requires its own version, it makes sense to just split them out for each size.
---
Review
Quoted 5 lines · Eric Anholt
#define
I915_READ8(reg)i915_read(dev_priv, (reg), 1)
#defineI915_WRITE8(reg, val)i915_write(dev_priv, (reg), (val), 1)
#defineI915_WRITE64(reg, val)i915_write(dev_priv, (reg), (val), 8)(quoted diff) +1
-1-#define I915_READ64(reg) i915_read(dev_priv, (reg), 8) +#define I915_READ64(reg) i915_read64(dev_priv, (reg))
Now that we've got two functions for this, it seems like it would be better to just create per-size versions in both directions, otherwise changes to the 8/16/32 bit version are unlikely to get propagated to the 64-bit version.
drivers/gpu/drm/i915/i915_drv.h | 106 ++++++++++++++++++++++---------------- 1 files changed, 61 insertions(+), 45 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +61 -45
@@ -1237,14 +1237,14 @@ extern void intel_overlay_print_error_state(struct seq_file *m, struct intel_oveLOCK_TEST_WITH_RETURN (dev, file_priv); \ } while (0) -#define I915_READ (reg) i915_read(dev_priv, (reg), 4) -#define I915_WRITE (reg, val) i915_write(dev_priv, (reg), (val), 4) -#define I915_READ16 (reg) i915_read(dev_priv, (reg), 2) -#define I915_WRITE16 (reg, val) i915_write(dev_priv, (reg), (val), 2) -#define I915_READ8 (reg) i915_read(dev_priv, (reg), 1) -#define I915_WRITE8 (reg, val) i915_write(dev_priv, (reg), (val), 1) -#define I915_WRITE64 (reg, val) i915_write(dev_priv, (reg), (val), 8) -#define I915_READ64 (reg) i915_read(dev_priv, (reg), 8) +#define I915_READ (reg) i915_read32(dev_priv, (reg)) +#define I915_WRITE (reg, val) i915_write32(dev_priv, (reg), (val)) +#define I915_READ16 (reg) i915_read16(dev_priv, (reg)) +#define I915_WRITE16 (reg, val) i915_write16(dev_priv, (reg), (val)) +#define I915_READ8 (reg) i915_read8(dev_priv, (reg)) +#define I915_WRITE8 (reg, val) i915_write8(dev_priv, (reg), (val)) +#define I915_WRITE64 (reg, val) i915_write64(dev_priv, (reg), (val)) +#define I915_READ64 (reg) i915_read64(dev_priv, (reg))#define I915_READ_NOTRACE (reg) readl(dev_priv->regs + (reg))#define I915_WRITE_NOTRACE (reg, val) writel(val, dev_priv->regs + (reg))
@@ -1254,27 +1254,32 @@ extern void intel_overlay_print_error_state(struct seq_file *m, struct intel_ove#define POSTING_READ (reg) (void)I915_READ_NOTRACE(reg)#define POSTING_READ16 (reg) (void)I915_READ16_NOTRACE(reg) -static inline u32 i915_read (struct drm_i915_private *dev_priv,u32 reg,int len) +static inline u8 i915_read8 (struct drm_i915_private *dev_priv,u32 reg) { -u64 val =0 ; - -switch (len) { -case 8 : - val =readq (dev_priv->regs + reg); -break ; -case 4 : - val =readl (dev_priv->regs + reg); -break ; -case 2 : - val =readw (dev_priv->regs + reg); -break ; -case 1 : - val =readb (dev_priv->regs + reg); -break ; - } -trace_i915_reg_rw ('R' , reg, val, len); - -return val; +u8 val =readb (dev_priv->regs + reg); +trace_i915_reg_rw ('R' , reg, val,1 ); +return val; +} + +static inline u16 i915_read16 (struct drm_i915_private *dev_priv,u32 reg) +{ +u16 val =readw (dev_priv->regs + reg); +trace_i915_reg_rw ('R' , reg, val,2 ); +return val; +} + +static inline u32 i915_read32 (struct drm_i915_private *dev_priv,u32 reg) +{ +u32 val =readl (dev_priv->regs + reg); +trace_i915_reg_rw ('R' , reg, val,4 ); +return val; +} + +static inline u64 i915_read64 (struct drm_i915_private *dev_priv,u32 reg) +{ +u64 val =readq (dev_priv->regs + reg); +trace_i915_reg_rw ('R' , reg, val,8 ); +return val; }/* On SNB platform, before reading ring registers forcewake bit
@@ -1295,24 +1300,35 @@ static inline u32 i915_safe_read(struct drm_i915_private *dev_priv, u32 reg) }static inline void -i915_write (struct drm_i915_private *dev_priv,u32 reg,u64 val,int len) +i915_write8 (struct drm_i915_private *dev_priv,u32 reg,u8 val) +{ +/* Trace down the write operation before the real write */ +trace_i915_reg_rw ('W' , reg, val,1 ); +writeb (val, dev_priv->regs + reg); +} + +static inline void +i915_write16 (struct drm_i915_private *dev_priv,u32 reg,u16 val) +{ +/* Trace down the write operation before the real write */ +trace_i915_reg_rw ('W' , reg, val,2 ); +writew (val, dev_priv->regs + reg); +} + +static inline void +i915_write32 (struct drm_i915_private *dev_priv,u32 reg,u32 val) +{ +/* Trace down the write operation before the real write */ +trace_i915_reg_rw ('W' , reg, val,4 ); +writel (val, dev_priv->regs + reg); +} + +static inline void +i915_write64 (struct drm_i915_private *dev_priv,u32 reg,u64 val) { -/* Trace down the write operation before the real write */ -trace_i915_reg_rw ('W' , reg, val, len); -switch (len) { -case 8 : -writeq (val, dev_priv->regs + reg); -break ; -case 4 : -writel (val, dev_priv->regs + reg); -break ; -case 2 : -writew (val, dev_priv->regs + reg); -break ; -case 1 : -writeb (val, dev_priv->regs + reg); -break ; - } +/* Trace down the write operation before the real write */ +trace_i915_reg_rw ('W' , reg, val,8 ); +writeq (val, dev_priv->regs + reg); }#define BEGIN_LP_RING (n) \
Signature · 4 lines
1.7.2.3 -- [email protected]
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Keith Packard
We were reading our 64-bit value in
I915_READ64and returning 32 bits of it. The restoration of fence regs at resume then had a zero end value, and the fence had no effect.Version 2: Split register access functions into per-size versions
This also helps silence sparse since it doesn't seem able to do compile-time constant propagation dead-code elimination. Minor, yet annoying, issue.
Thanks,
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Quoted 4 lines · Keith Packard
We were reading our 64-bit value in
I915_READ64and returning 32 bits of it. The restoration of fence regs at resume then had a zero end value, and the fence had no effect.
It was a good catch. Applied one final tweak to use macros to generate the various read/write routines and applied to -next. -Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Quoted 9 lines · Chris Wilson
Quoted 4 lines · Keith Packard
We were reading our 64-bit value in
I915_READ64and returning 32 bits of it. The restoration of fence regs at resume then had a zero end value, and the fence had no effect.It was a good catch. Applied one final tweak to use macros to generate the various read/write routines and applied to -next. -Chris
Chris, does this sound like it might be behind the bug I mentioned on IRC?
Signature · 11 lines
Peter Clifton Electrical Engineering Division, Engineering Department, University of Cambridge, 9, JJ Thomson Avenue, Cambridge CB3 0FA Tel: +44 (0)7729 980173 - (No signal in the lab!) Tel: +44 (0)1223 748328 - (Shared lab phone, ask for me)