diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-02 07:17:23 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-02 07:17:23 -0400 |
commit | 27153f72d04bcd83b3a66e219418a21d6269553b (patch) | |
tree | df3be8e993b0f550a19679014e33a307513d18b9 | |
parent | 8c1812ad4879676bec1bd20f8ff478c8a076f3fc (diff) |
drm/i915: Drop the iomem accessors when writing to the kmapped blt batch
I presumed that we would be writing to the batch through the GTT having
bound it, so I converted it to use iomem. Even later as I spotted that
we didn't even move the batch to the GTT (now an issue since we default
to uncached memory on SNB) I still didn't realise that using iomem for
kmapped memory was incorrect. Fix it.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index a0702b6fb631..85071570e1f9 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
@@ -899,7 +899,7 @@ static int blt_ring_init(struct intel_ring_buffer *ring) | |||
899 | { | 899 | { |
900 | if (NEED_BLT_WORKAROUND(ring->dev)) { | 900 | if (NEED_BLT_WORKAROUND(ring->dev)) { |
901 | struct drm_i915_gem_object *obj; | 901 | struct drm_i915_gem_object *obj; |
902 | u32 __iomem *ptr; | 902 | u32 *ptr; |
903 | int ret; | 903 | int ret; |
904 | 904 | ||
905 | obj = to_intel_bo(i915_gem_alloc_object(ring->dev, 4096)); | 905 | obj = to_intel_bo(i915_gem_alloc_object(ring->dev, 4096)); |
@@ -913,8 +913,8 @@ static int blt_ring_init(struct intel_ring_buffer *ring) | |||
913 | } | 913 | } |
914 | 914 | ||
915 | ptr = kmap(obj->pages[0]); | 915 | ptr = kmap(obj->pages[0]); |
916 | iowrite32(MI_BATCH_BUFFER_END, ptr); | 916 | *ptr++ = MI_BATCH_BUFFER_END; |
917 | iowrite32(MI_NOOP, ptr+1); | 917 | *ptr++ = MI_NOOP; |
918 | kunmap(obj->pages[0]); | 918 | kunmap(obj->pages[0]); |
919 | 919 | ||
920 | ret = i915_gem_object_set_to_gtt_domain(&obj->base, false); | 920 | ret = i915_gem_object_set_to_gtt_domain(&obj->base, false); |