diff options
| author | Eric Anholt <eric@anholt.net> | 2008-07-28 15:17:21 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-07-28 23:12:26 -0700 |
| commit | 1d2bb68d28fe39746299ee8ddb664a62de839b0c (patch) | |
| tree | f1f89d0ea693a0520f4e856296c4d3d4d721501f /linux-core/i915_fence.c | |
| parent | 487c42bd42d93304278abce03b36c935bdc83284 (diff) | |
| parent | 514c05cebe31a62f827a76f348d35596bef97811 (diff) | |
Merge commit 'origin/master' into drm-gem
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Diffstat (limited to 'linux-core/i915_fence.c')
| -rw-r--r-- | linux-core/i915_fence.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/i915_fence.c b/linux-core/i915_fence.c index e403be6a..45613c3a 100644 --- a/linux-core/i915_fence.c +++ b/linux-core/i915_fence.c @@ -46,7 +46,7 @@ static inline void i915_initiate_rwflush(struct drm_i915_private *dev_priv, dev_priv->flush_sequence = (uint32_t) READ_BREADCRUMB(dev_priv); dev_priv->flush_flags = fc->pending_flush; dev_priv->saved_flush_status = READ_HWSP(dev_priv, 0); - I915_WRITE(I915REG_INSTPM, (1 << 5) | (1 << 21)); + I915_WRITE(INSTPM, (1 << 5) | (1 << 21)); dev_priv->flush_pending = 1; fc->pending_flush &= ~DRM_I915_FENCE_TYPE_RW; } |