---

yaml --- r: 310566 b: refs/heads/master c: 3eef891 h: refs/heads/master v: v3
git-mirror · Jun 4, 2012 · 6ef0a02 · 6ef0a02
1 parent 083afc5
commit 6ef0a02
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e612a008fa7fe493a473454def56aa321479495
+refs/heads/master: 3eef8918ff440837f6af791942d8dd07e1a268ee
diff --git a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -988,6 +988,10 @@ static int intel_init_ring_buffer(struct drm_device *dev,
 	if (ret)
 		goto err_unref;
 
+	ret = i915_gem_object_set_to_gtt_domain(obj, true);
+	if (ret)
+		goto err_unpin;
+
 	ring->virtual_start = ioremap_wc(dev->agp->base + obj->gtt_offset,
 					 ring->size);
 	if (ring->virtual_start == NULL) {