diff options
| author | Keith Packard <keithp@keithp.com> | 2009-04-30 14:43:43 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-04-30 15:51:02 -0700 |
| commit | 049ef7e40fc9959db480b2753a1dbe734d98e948 (patch) | |
| tree | df78069ef8edfc8ffc3b1f741d2c58085ffeaaa0 /drivers/gpu | |
| parent | 091438dd5668396328a3419abcbc6591159eb8d1 (diff) | |
| download | linux-049ef7e40fc9959db480b2753a1dbe734d98e948.tar.gz linux-049ef7e40fc9959db480b2753a1dbe734d98e948.tar.bz2 linux-049ef7e40fc9959db480b2753a1dbe734d98e948.zip | |
drm/i915: x86 always has writeq. Add I915_READ64 for symmetry.
i386 has inline code for writeq and readq, so just use those instead of ugly
macros which evaluate arguments multiple times.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 25065923b8a8..df08eb4240b6 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -705,13 +705,8 @@ extern void intel_modeset_cleanup(struct drm_device *dev); #define I915_WRITE16(reg, val) writel(val, dev_priv->regs + (reg)) #define I915_READ8(reg) readb(dev_priv->regs + (reg)) #define I915_WRITE8(reg, val) writeb(val, dev_priv->regs + (reg)) -#ifdef writeq #define I915_WRITE64(reg, val) writeq(val, dev_priv->regs + (reg)) -#else -#define I915_WRITE64(reg, val) (writel(val, dev_priv->regs + (reg)), \ - writel(upper_32_bits(val), dev_priv->regs + \ - (reg) + 4)) -#endif +#define I915_READ64(reg) readq(dev_priv->regs + (reg)) #define POSTING_READ(reg) (void)I915_READ(reg) #define I915_VERBOSE 0 |