Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:08:42 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: i915_drv.h
Log Message:
Convert I915_READ*_NOTRACE to use DRM_READ*.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.6 -r1.1.1.1.2.7 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.1.1.1.2.6 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.1.1.1.2.7
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.1.1.1.2.6 Wed Jul 24 03:08:23 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Wed Jul 24 03:08:42 2013
@@ -1742,13 +1742,23 @@ __i915_write(64, q)
#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))
