Merge branch 'drm-kms-locking' of git://people.freedesktop.org/~danvet/drm-intel...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / gpu / drm / i915 / intel_overlay.c

diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index 5be09d125509827c67b6c7141620c8d4e29a139e..1e901c3c18af8160cd42fd3631fbf8d3ca10efa1 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;