From bdbd16a350cf2a60b923185142b8642b0ce72c4c Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 15 Nov 2012 11:32:28 +0000
Subject: [PATCH] --- yaml --- r: 357877 b: refs/heads/master c:
 ebc052e0c65f84f68626e388ffa1704b3a190ef7 h: refs/heads/master i:   357875:
 1b07d0cef4090d5ef8168c62f2c05c91e3b5c654 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/gpu/drm/i915/intel_ringbuffer.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3078e2f1e1fc..a0ff7404a124 100644
--- 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
index bc7cf7c63108..36e1e13ae946 100644
--- 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;