Merge drm/drm-next into drm-intel-gt-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / display / intel_plane_initial.c

diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c
index bb6ea7de5c61ea2bbac4b8d2c6af7fe9a3ff9708..736072a8b2b0335be9373f8f3d8e9763d6ce589a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_plane_initial.c
+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c
@@ -110,7 +110,9 @@ initial_plane_vma(struct drm_i915_private *i915,
            size * 2 > i915->dsm.usable_size)
                return NULL;
 
-       obj = i915_gem_object_create_region_at(mem, phys_base, size, 0);
+       obj = i915_gem_object_create_region_at(mem, phys_base, size,
+                                              I915_BO_ALLOC_USER |
+                                              I915_BO_PREALLOC);
        if (IS_ERR(obj))
                return NULL;