Merge drm/drm-next into drm-xe-next
authorThomas Hellström <thomas.hellstrom@linux.intel.com>
Fri, 12 Apr 2024 13:14:25 +0000 (15:14 +0200)
committerThomas Hellström <thomas.hellstrom@linux.intel.com>
Fri, 12 Apr 2024 13:14:25 +0000 (15:14 +0200)
commit79790b6818e96c58fe2bffee1b418c16e64e7b80
tree1b1f34807410ae05c17658c768f45f951e9420bc
parent12f4b58a37f48a049893f1ae04b3fbb9b5088e8c
parent6e1f415e7129f7cd4c2394af83b35cdcdd40baf7
Merge drm/drm-next into drm-xe-next

Backmerging drm-next in order to get up-to-date and in particular
to access commit 9ca5facd0400f610f3f7f71aeb7fc0b949a48c67.

Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
drivers/gpu/drm/xe/Kconfig
drivers/gpu/drm/xe/Makefile
drivers/gpu/drm/xe/tests/xe_migrate.c
drivers/gpu/drm/xe/xe_drm_client.c
drivers/gpu/drm/xe/xe_pm.c
drivers/gpu/drm/xe/xe_vm.c
drivers/gpu/drm/xe/xe_vm_types.h