From bfab32709af29cd71ea52a4400a15506353c1b7d Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 15 Nov 2012 11:32:27 +0000
Subject: [PATCH] --- yaml --- r: 357876 b: refs/heads/master c:
 0ffb0ff283cca16f72caf29c44496d83b0c291fb h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b8034b0298aa..3078e2f1e1fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0104fdbb84d7adb0e377ed05bf75eba97b007544
+refs/heads/master: 0ffb0ff283cca16f72caf29c44496d83b0c291fb
diff --git a/trunk/drivers/gpu/drm/i915/intel_fb.c b/trunk/drivers/gpu/drm/i915/intel_fb.c
index 7b30b5c2c4ee..b7773e548911 100644
--- a/trunk/drivers/gpu/drm/i915/intel_fb.c
+++ b/trunk/drivers/gpu/drm/i915/intel_fb.c
@@ -83,7 +83,9 @@ static int intelfb_create(struct intel_fbdev *ifbdev,
 
 	size = mode_cmd.pitches[0] * mode_cmd.height;
 	size = ALIGN(size, PAGE_SIZE);
-	obj = i915_gem_alloc_object(dev, size);
+	obj = i915_gem_object_create_stolen(dev, size);
+	if (obj == NULL)
+		obj = i915_gem_alloc_object(dev, size);
 	if (!obj) {
 		DRM_ERROR("failed to allocate framebuffer\n");
 		ret = -ENOMEM;