Merge drm/drm-next into drm-intel-gt-next
authorJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Wed, 15 Sep 2021 10:23:27 +0000 (13:23 +0300)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Wed, 15 Sep 2021 10:23:27 +0000 (13:23 +0300)
commitd5dd580deb54483cce0cb5bbe3f1a132a28c767d
tree8803403033d49e5b57b81a68b02326943b24b067
parente935405102783219b883b1e50539908f21463e9a
parent6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f
Merge drm/drm-next into drm-intel-gt-next

Close the divergence which has caused patches not to apply and
have a solid baseline for the PXP patches that Rodrigo will send
a topic branch PR for.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
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/i915_debugfs.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gpu_error.c
drivers/gpu/drm/i915/i915_pci.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_uncore.c
drivers/gpu/drm/ttm/ttm_bo_util.c