---

yaml --- r: 357877 b: refs/heads/master c: ebc052e h: refs/heads/master i: 357875: 1b07d0c v: v3
git-mirror · Nov 30, 2012 · bdbd16a · bdbd16a
1 parent bfab327
commit bdbd16a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ffb0ff283cca16f72caf29c44496d83b0c291fb
+refs/heads/master: ebc052e0c65f84f68626e388ffa1704b3a190ef7
diff --git a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1113,7 +1113,11 @@ static int intel_init_ring_buffer(struct drm_device *dev,
 			return ret;
 	}
 
-	obj = i915_gem_alloc_object(dev, ring->size);
+	obj = NULL;
+	if (!HAS_LLC(dev))
+		obj = i915_gem_object_create_stolen(dev, ring->size);
+	if (obj == NULL)
+		obj = i915_gem_alloc_object(dev, ring->size);
 	if (obj == NULL) {
 		DRM_ERROR("Failed to allocate ringbuffer\n");
 		ret = -ENOMEM;