Merge drm/drm-next into drm-intel-gt-next
authorJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Tue, 11 Apr 2023 12:43:45 +0000 (15:43 +0300)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Tue, 11 Apr 2023 12:43:45 +0000 (15:43 +0300)
commitea68a3e9d14e9e0bf017d178fb4bd53b6deb1482
tree4ca0e37218ecc0844d330cb37b956d5219bb1d32
parent16fc9c08f0ec7b1c95f1ea4a16097acdb3fc943d
parent55bf14961db9da61220e6f04bc9919c94b1a6585
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>
drivers/gpu/drm/i915/display/intel_fbdev.c
drivers/gpu/drm/i915/display/intel_plane_initial.c
drivers/gpu/drm/i915/gem/i915_gem_mman.c
drivers/gpu/drm/i915/gem/i915_gem_object_types.h
drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c
drivers/gpu/drm/i915/gt/intel_gt_regs.h
drivers/gpu/drm/i915/gt/intel_workarounds.c