Merge drm/drm-next into drm-intel-gt-next
authorJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Tue, 12 Apr 2022 08:28:42 +0000 (11:28 +0300)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Tue, 12 Apr 2022 08:28:42 +0000 (11:28 +0300)
Pull in TTM changes needed for DG2 CCS enabling from Ram.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
1  2 
drivers/gpu/drm/i915/Kconfig
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
drivers/gpu/drm/i915/gem/i915_gem_ttm.c
drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/i915_vma.c

Simple merge
Simple merge
Simple merge
Simple merge