summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2014-02-14 14:01:14 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-02-14 14:17:42 +0100
commitbe1fa129f5a31e78ce0a692f0e30c2ff0fad9ebe (patch)
tree88e363455c5fa9f8d79ca2ecdb6597fe6a6706ee
parenta9cc726c8546bc6efa43b86465570a4447a54722 (diff)
downloadblackbird-op-linux-be1fa129f5a31e78ce0a692f0e30c2ff0fad9ebe.tar.gz
blackbird-op-linux-be1fa129f5a31e78ce0a692f0e30c2ff0fad9ebe.zip
drm/i915: Don't set PIN_MAPPABLE for legacy ringbuffers
Tighter code since legacy gem has only mappable anyway. Split out from Chris vma-bind rework. Note that this is only possible due to the split-up of the mappable pin flag into PIN_GLOBAL and PIN_MAPPABLE. Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Ben Widawsky <benjamin.widawsky@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 0fd6ba0c4418..bcaa14976c58 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1920,7 +1920,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
return -ENOMEM;
}
- ret = i915_gem_obj_ggtt_pin(obj, 0, PIN_MAPPABLE);
+ ret = i915_gem_obj_ggtt_pin(obj, 0, 0);
if (ret != 0) {
drm_gem_object_unreference(&obj->base);
DRM_ERROR("Failed to ping batch bo\n");
OpenPOWER on IntegriCloud