Wed Jul 24 03:08:42 2013 UTC ()
Convert I915_READ*_NOTRACE to use DRM_READ*.


(riastradh)
diff -r1.1.1.1.2.6 -r1.1.1.1.2.7 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
cvs diff -r1.1.1.1.2.6 -r1.1.1.1.2.7 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h 2013/07/24 03:08:23 1.1.1.1.2.6
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h 2013/07/24 03:08:42 1.1.1.1.2.7
@@ -1732,29 +1732,39 @@ __i915_read(64, q) @@ -1732,29 +1732,39 @@ __i915_read(64, q)
1732 void i915_write##x(struct drm_i915_private *dev_priv, u32 reg, u##x val); 1732 void i915_write##x(struct drm_i915_private *dev_priv, u32 reg, u##x val);
1733 1733
1734__i915_write(8, b) 1734__i915_write(8, b)
1735__i915_write(16, w) 1735__i915_write(16, w)
1736__i915_write(32, l) 1736__i915_write(32, l)
1737__i915_write(64, q) 1737__i915_write(64, q)
1738#undef __i915_write 1738#undef __i915_write
1739 1739
1740#define I915_READ8(reg) i915_read8(dev_priv, (reg)) 1740#define I915_READ8(reg) i915_read8(dev_priv, (reg))
1741#define I915_WRITE8(reg, val) i915_write8(dev_priv, (reg), (val)) 1741#define I915_WRITE8(reg, val) i915_write8(dev_priv, (reg), (val))
1742 1742
1743#define I915_READ16(reg) i915_read16(dev_priv, (reg)) 1743#define I915_READ16(reg) i915_read16(dev_priv, (reg))
1744#define I915_WRITE16(reg, val) i915_write16(dev_priv, (reg), (val)) 1744#define I915_WRITE16(reg, val) i915_write16(dev_priv, (reg), (val))
 1745#ifdef __NetBSD__
 1746#define I915_READ16_NOTRACE(reg) DRM_READ16(dev_priv->regs_map, (reg))
 1747#define I915_WRITE16_NOTRACE(reg, val) DRM_WRITE16(dev_priv->regs_map, (reg), (val))
 1748#else
1745#define I915_READ16_NOTRACE(reg) readw(dev_priv->regs + (reg)) 1749#define I915_READ16_NOTRACE(reg) readw(dev_priv->regs + (reg))
1746#define I915_WRITE16_NOTRACE(reg, val) writew(val, dev_priv->regs + (reg)) 1750#define I915_WRITE16_NOTRACE(reg, val) writew(val, dev_priv->regs + (reg))
 1751#endif
1747 1752
1748#define I915_READ(reg) i915_read32(dev_priv, (reg)) 1753#define I915_READ(reg) i915_read32(dev_priv, (reg))
1749#define I915_WRITE(reg, val) i915_write32(dev_priv, (reg), (val)) 1754#define I915_WRITE(reg, val) i915_write32(dev_priv, (reg), (val))
 1755#ifdef __NetBSD__
 1756#define I915_READ_NOTRACE(reg) DRM_READ32(dev_priv->regs_map, (reg))
 1757#define I915_WRITE_NOTRACE(reg, val) DRM_WRITE32(dev_priv->regs_map, (reg), (val))
 1758#else
1750#define I915_READ_NOTRACE(reg) readl(dev_priv->regs + (reg)) 1759#define I915_READ_NOTRACE(reg) readl(dev_priv->regs + (reg))
1751#define I915_WRITE_NOTRACE(reg, val) writel(val, dev_priv->regs + (reg)) 1760#define I915_WRITE_NOTRACE(reg, val) writel(val, dev_priv->regs + (reg))
 1761#endif
1752 1762
1753#define I915_WRITE64(reg, val) i915_write64(dev_priv, (reg), (val)) 1763#define I915_WRITE64(reg, val) i915_write64(dev_priv, (reg), (val))
1754#define I915_READ64(reg) i915_read64(dev_priv, (reg)) 1764#define I915_READ64(reg) i915_read64(dev_priv, (reg))
1755 1765
1756#define POSTING_READ(reg) (void)I915_READ_NOTRACE(reg) 1766#define POSTING_READ(reg) (void)I915_READ_NOTRACE(reg)
1757#define POSTING_READ16(reg) (void)I915_READ16_NOTRACE(reg) 1767#define POSTING_READ16(reg) (void)I915_READ16_NOTRACE(reg)
1758 1768
1759 1769
1760#endif 1770#endif