summaryrefslogtreecommitdiff
path: root/shared-core/i915_drv.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2006-08-10 14:38:50 +1000
committerDave Airlie <airlied@linux.ie>2006-08-10 14:38:50 +1000
commit7a46d4139982cc82559ccf9a1bc09a52bdf12223 (patch)
tree3dc2b701bc3fd872e85a82f5190ae133545bcd8a /shared-core/i915_drv.h
parent5340a7022766f3437fcaf9d8d4d83944befc2fa2 (diff)
i965 code and Linux coding style < 0
smack my whitespace up.
Diffstat (limited to 'shared-core/i915_drv.h')
-rw-r--r--shared-core/i915_drv.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index 550e386f..a87075b1 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -141,14 +141,14 @@ extern void i915_mem_release(drm_device_t * dev,
#define I915_VERBOSE 0
#define RING_LOCALS unsigned int outring, ringmask, outcount; \
- volatile char *virt;
+ volatile char *virt;
#define BEGIN_LP_RING(n) do { \
if (I915_VERBOSE) \
DRM_DEBUG("BEGIN_LP_RING(%d) in %s\n", \
(n), __FUNCTION__); \
- if (dev_priv->ring.space < (n)*4) \
- i915_wait_ring(dev, (n)*4, __FUNCTION__); \
+ if (dev_priv->ring.space < (n)*4) \
+ i915_wait_ring(dev, (n)*4, __FUNCTION__); \
outcount = 0; \
outring = dev_priv->ring.tail; \
ringmask = dev_priv->ring.tail_mask; \
@@ -158,7 +158,7 @@ extern void i915_mem_release(drm_device_t * dev,
#define OUT_RING(n) do { \
if (I915_VERBOSE) DRM_DEBUG(" OUT_RING %x\n", (int)(n)); \
*(volatile unsigned int *)(virt + outring) = (n); \
- outcount++; \
+ outcount++; \
outring += 4; \
outring &= ringmask; \
} while (0)