drm/i915: Allocate overlay registers from stolen memory

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Acked-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index d7bc817f51a024b803986e76fa492146632da66d..fabe0acf808d9be30e4d74d64201678aa28701d2 100644 (file)
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/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;