Merge v6.13 into drm-next
authorSimona Vetter <simona.vetter@ffwll.ch>
Thu, 23 Jan 2025 13:39:49 +0000 (14:39 +0100)
committerSimona Vetter <simona.vetter@ffwll.ch>
Thu, 23 Jan 2025 13:42:21 +0000 (14:42 +0100)
commit07c5b277208cf9a9e9cf31bf0143977d7f030aa1
tree8c30e64d4b9bbb433e50785fb40860ee5c46a4eb
parent951a6bf30667307e7901aac5e74e50dadd5ccfc7
parentffd294d346d185b70e28b1a28abe367bbfe53c04
Merge v6.13 into drm-next

A regression was caused by commit e4b5ccd392b9 ("drm/v3d: Ensure job
pointer is set to NULL after job completion"), but this commit is not
yet in next-fixes, fast-forward it.

Note that this recreates Linus merge in 96c84703f1cf ("Merge tag
'drm-next-2025-01-17' of https://gitlab.freedesktop.org/drm/kernel")
because I didn't want to backmerge a random point in the merge window.

Signed-off-by: Simona Vetter <simona.vetter@ffwll.ch>
16 files changed:
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
drivers/gpu/drm/bridge/ite-it6263.c
drivers/gpu/drm/display/drm_bridge_connector.c
drivers/gpu/drm/drm_connector.c
drivers/gpu/drm/mediatek/mtk_dp.c
drivers/gpu/drm/mediatek/mtk_drm_drv.c
drivers/gpu/drm/tests/drm_connector_test.c
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
drivers/gpu/drm/xe/tests/xe_bo.c
drivers/gpu/drm/xe/tests/xe_mocs.c
drivers/gpu/drm/xe/xe_gt.h
drivers/gpu/drm/xe/xe_hw_engine.c
drivers/gpu/drm/xe/xe_oa.c