Merge drm/drm-next into drm-xe-next
authorThomas Hellström <thomas.hellstrom@linux.intel.com>
Fri, 4 Oct 2024 09:29:21 +0000 (11:29 +0200)
committerThomas Hellström <thomas.hellstrom@linux.intel.com>
Fri, 4 Oct 2024 09:46:30 +0000 (11:46 +0200)
commitb88132ceb3faccdd785809df75f9d490ebaab459
treeea383d842f8b5fc4f72ca1ebbd6c02a99754071b
parent491418a258322bbd7f045e36884d2849b673f23d
parent9852d85ec9d492ebef56dc5f229416c925758edc
Merge drm/drm-next into drm-xe-next

Backmerging to resolve a conflict with core locally.

Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
drivers/gpu/drm/xe/xe_device.c
drivers/gpu/drm/xe/xe_gt.c
drivers/gpu/drm/xe/xe_gt.h
drivers/gpu/drm/xe/xe_gt_idle.c
drivers/gpu/drm/xe/xe_oa.c