---

yaml --- r: 357878 b: refs/heads/master c: 8040513 h: refs/heads/master v: v3
git-mirror · Nov 30, 2012 · b243048 · b243048
1 parent bdbd16a
commit b243048
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebc052e0c65f84f68626e388ffa1704b3a190ef7
+refs/heads/master: 8040513870399f1cb032cb8bc805df5042fedcdf
diff --git a/trunk/drivers/gpu/drm/i915/intel_overlay.c b/trunk/drivers/gpu/drm/i915/intel_overlay.c
@@ -1333,8 +1333,10 @@ void intel_setup_overlay(struct drm_device *dev)
 
 	overlay->dev = dev;
 
-	reg_bo = i915_gem_alloc_object(dev, PAGE_SIZE);
-	if (!reg_bo)
+	reg_bo = i915_gem_object_create_stolen(dev, PAGE_SIZE);
+	if (reg_bo == NULL)
+		reg_bo = i915_gem_alloc_object(dev, PAGE_SIZE);
+	if (reg_bo == NULL)
 		goto out_free;
 	overlay->reg_bo = reg_bo;