[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/drm/i915 Convert I915_RE...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8f59545792a9
branches:  riastradh-drm2
changeset: 788300:8f59545792a9
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 03:08:42 2013 +0000

description:
Convert I915_READ*_NOTRACE to use DRM_READ*.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h |  10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diffs (27 lines):

diff -r 2f3e54811926 -r 8f59545792a9 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Wed Jul 24 03:08:23 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Wed Jul 24 03:08:42 2013 +0000
@@ -1742,13 +1742,23 @@
 
 #define I915_READ16(reg)       i915_read16(dev_priv, (reg))
 #define I915_WRITE16(reg, val) i915_write16(dev_priv, (reg), (val))
+#ifdef __NetBSD__
+#define        I915_READ16_NOTRACE(reg)        DRM_READ16(dev_priv->regs_map, (reg))
+#define        I915_WRITE16_NOTRACE(reg, val)  DRM_WRITE16(dev_priv->regs_map, (reg), (val))
+#else
 #define I915_READ16_NOTRACE(reg)       readw(dev_priv->regs + (reg))
 #define I915_WRITE16_NOTRACE(reg, val) writew(val, dev_priv->regs + (reg))
+#endif
 
 #define I915_READ(reg)         i915_read32(dev_priv, (reg))
 #define I915_WRITE(reg, val)   i915_write32(dev_priv, (reg), (val))
+#ifdef __NetBSD__
+#define I915_READ_NOTRACE(reg)         DRM_READ32(dev_priv->regs_map, (reg))
+#define I915_WRITE_NOTRACE(reg, val)   DRM_WRITE32(dev_priv->regs_map, (reg), (val))
+#else
 #define I915_READ_NOTRACE(reg)         readl(dev_priv->regs + (reg))
 #define I915_WRITE_NOTRACE(reg, val)   writel(val, dev_priv->regs + (reg))
+#endif
 
 #define I915_WRITE64(reg, val) i915_write64(dev_priv, (reg), (val))
 #define I915_READ64(reg)       i915_read64(dev_priv, (reg))