Merge drm/drm-next into drm-intel-gt-next
authorTvrtko Ursulin <tvrtko.ursulin@intel.com>
Tue, 18 Jan 2022 10:54:02 +0000 (10:54 +0000)
committerTvrtko Ursulin <tvrtko.ursulin@intel.com>
Tue, 18 Jan 2022 10:54:02 +0000 (10:54 +0000)
commit647bfd26bf054313305ea9c2c4a1c71f3bbfee63
tree49abfde459ef32c9811d06ae59dfbaf0000762ab
parent3a5d604f90f90a09e35ccfdeeedbadfd06b606db
parent4efdddbce7c1329f00c458e85dcaf105aebdc0ed
Merge drm/drm-next into drm-intel-gt-next

Maarten needs backmerge to account for header file renames/changes which
landed via drm-intel-next and are interfering with his pinning work.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
17 files changed:
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/display/intel_dpt.c
drivers/gpu/drm/i915/display/intel_fbc.c
drivers/gpu/drm/i915/display/intel_plane_initial.c
drivers/gpu/drm/i915/gem/i915_gem_context.c
drivers/gpu/drm/i915/gem/i915_gem_mman.c
drivers/gpu/drm/i915/gt/intel_ggtt.c
drivers/gpu/drm/i915/gt/intel_gt.c
drivers/gpu/drm/i915/gt/intel_gtt.c
drivers/gpu/drm/i915/gt/intel_gtt.h
drivers/gpu/drm/i915/gt/uc/intel_uc.c
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_driver.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_module.c
drivers/gpu/drm/i915/i915_request.c
drivers/gpu/drm/i915/i915_vma_types.h