From: Joonas Lahtinen Date: Tue, 11 Apr 2023 12:43:45 +0000 (+0300) Subject: Merge drm/drm-next into drm-intel-gt-next X-Git-Tag: v6.5-rc1~153^2~14^2~102 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea68a3e9d14e9e0bf017d178fb4bd53b6deb1482;p=thirdparty%2Flinux.git Merge drm/drm-next into drm-intel-gt-next Need to pull in commit from drm-next (earlier in drm-intel-next): 1eca0778f4b3 ("drm/i915: add struct i915_dsm to wrap dsm members together") In order to merge following patch to drm-intel-gt-next: https://patchwork.freedesktop.org/patch/530942/?series=114925&rev=6 Signed-off-by: Joonas Lahtinen --- ea68a3e9d14e9e0bf017d178fb4bd53b6deb1482 diff --cc drivers/gpu/drm/i915/display/intel_plane_initial.c index 3a95d24eab744,bb6ea7de5c61e..736072a8b2b03 --- a/drivers/gpu/drm/i915/display/intel_plane_initial.c +++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c @@@ -107,12 -107,10 +107,12 @@@ initial_plane_vma(struct drm_i915_priva */ if (IS_ENABLED(CONFIG_FRAMEBUFFER_CONSOLE) && mem == i915->mm.stolen_region && - size * 2 > i915->stolen_usable_size) + 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;