drm/i915/display: Set I915_BO_ALLOC_USER for fb

Framebuffer is exposed to userspace so make sure we set
proper flags for it. Set I915_BO_PREALLOC for prealloced
fb so that ttm won't clear existing data.

Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Andi Shyti <andi.shyti@linux.intel.com>
Cc: Andrzej Hajda <andrzej.hajda@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230404143100.10452-2-nirmoy.das@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
index 03ed4607a46d2181dded13e42398ddfffa38b944..9ea49aaa33caae5d6858f8403c74d2544dd4ea71 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
@@ -163,7 +163,8 @@ static int intelfb_alloc(struct drm_fb_helper *helper,
        obj = ERR_PTR(-ENODEV);
        if (HAS_LMEM(dev_priv)) {
                obj = i915_gem_object_create_lmem(dev_priv, size,
-                                                 I915_BO_ALLOC_CONTIGUOUS);
+                                                 I915_BO_ALLOC_CONTIGUOUS |
+                                                 I915_BO_ALLOC_USER);
        } else {
                /*
                 * If the FB is too big, just don't use it since fbdev is not very

diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c
index 76be796df255d94f67d9b8dd3070d08d095ff701..3a95d24eab744ad0609d9cacce6941812335939b 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->stolen_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;