Merge drm/drm-next into drm-intel-gt-next
authorJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Wed, 2 Jun 2021 07:18:45 +0000 (10:18 +0300)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Wed, 2 Jun 2021 07:18:45 +0000 (10:18 +0300)
commit942baad211336efefb93a8369478888ab845c450
treed959f4b4c0680e6b589cc9684bd489f09ee65fd8
parent35cbd91eb541e001f6e2648c56abb5361e3d6774
parentccd1950c2f7e38ae45aeefb99a08b39407cd6c63
Merge drm/drm-next into drm-intel-gt-next

Pulling in -rc2 fixes and TTM changes that next upcoming patches depend
on.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
drivers/gpu/drm/i915/gem/i915_gem_mman.c
drivers/gpu/drm/i915/gem/i915_gem_phys.c
drivers/gpu/drm/i915/gt/intel_ggtt.c
drivers/gpu/drm/i915/gt/intel_gtt.h
drivers/gpu/drm/i915/i915_drv.c