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 <joonas.lahtinen@linux.intel.com>

diff --cc drivers/gpu/drm/i915/display/intel_fbdev.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_plane_initial.c
index 3a95d24eab744ad0609d9cacce6941812335939b,bb6ea7de5c61ea2bbac4b8d2c6af7fe9a3ff9708..736072a8b2b0335be9373f8f3d8e9763d6ce589a
--- 1/drivers/gpu/drm/i915/display/intel_plane_initial.c
--- 2/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;
  

diff --cc drivers/gpu/drm/i915/gem/i915_gem_mman.c
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_object_types.h
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_gt_regs.h
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_workarounds.c
Simple merge