Merge drm/drm-next into drm-xe-next
authorThomas Hellström <thomas.hellstrom@linux.intel.com>
Mon, 4 Nov 2024 08:21:20 +0000 (09:21 +0100)
committerThomas Hellström <thomas.hellstrom@linux.intel.com>
Mon, 4 Nov 2024 08:21:20 +0000 (09:21 +0100)
commitc787c2901e2c03008e536b86cb0103ce6fd05e2d
tree06966989052f14f98c9b1ede0ea98822f317a586
parenta19d1db9a3fa89fabd7c83544b84f393ee9b851f
parent30169bb64580bd7bce9290c1952bf0aa6cc37fe5
Merge drm/drm-next into drm-xe-next

Backmerging to get up-to-date and to bring in a fix that was
merged through drm-misc-fixes.

Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
drivers/gpu/drm/xe/xe_bo.c
drivers/gpu/drm/xe/xe_device.c
drivers/gpu/drm/xe/xe_guc_ct.c
drivers/gpu/drm/xe/xe_guc_submit.c