Hi Linus, The cgroups fix is acked by Tejun. This also includes a recreated version of your drm-next merge commit because we needed v6.13 for a regression fix, and I didn't want to pull in a random point from the merge window. I checked to make sure it matches exactly what you've done. Otherwise nothing special, just the usual pile of fixes. Also somehow the diffstat that git request-pull generates looks really wrong, and I couldn't figure out why. Maybe because of the backmerge, but usually that all works. I created a test merge in your tree and the diffstat of that merge commit looks fine, so that's what I attached below. Just a heads-up, in case there's something funny going on at your end too. Dave should be back end of this week for the 2nd batch of merge window fixes. Cheers, Sima drm-next-2025-01-27: drm merge window fixes part 1 cgroup: - fix Koncfig fallout from new dmem controller Driver Changes: - v3d NULL pointer regression fix in fence signalling race - virtio: uaf in dma_buf free path - xlnx: fix kerneldoc - bochs: fix double-free on driver removal - zynqmp: add missing locking to DP bridge driver - amdgpu fixes all over: documentation, display, sriov, various hw block drivers - amdgpu: use drm/sched helper - amdgpu: mark some debug module options as unsafe - amdkfd: mark some debug module options as unsafe, trap handler updates, fix partial migration handling DRM core: - client: fix fbdev Kconfig select rules, improve tiled-based display support Cheers, Sima The following changes since commit ffd294d346d185b70e28b1a28abe367bbfe53c04: Linux 6.13 (2025-01-19 15:51:45 -0800) are available in the Git repository at: https://gitlab.freedesktop.org/drm/kernel.git tags/drm-next-2025-01-27 for you to fetch changes up to 64179a1416e1420a34226ab3beb5f84710953d16: Merge tag 'drm-misc-next-fixes-2025-01-24' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next (2025-01-24 17:06:06 +0100) ---------------------------------------------------------------- drm merge window fixes part 1 cgroup: - fix Koncfig fallout from new dmem controller Driver Changes: - v3d NULL pointer regression fix in fence signalling race - virtio: uaf in dma_buf free path - xlnx: fix kerneldoc - bochs: fix double-free on driver removal - zynqmp: add missing locking to DP bridge driver - amdgpu fixes all over: documentation, display, sriov, various hw block drivers - amdgpu: use drm/sched helper - amdgpu: mark some debug module options as unsafe - amdkfd: mark some debug module options as unsafe, trap handler updates, fix partial migration handling DRM core: - client: fix fbdev Kconfig select rules, improve tiled-based display support ---------------------------------------------------------------- Alex Deucher (4): drm/amdgpu: cache gpu pcie link width drm/amdgpu: fix the PCIe lanes reporting in the INFO IOCTL drm/amd/display: fix CEC DC_DEBUG_MASK documentation drm/amd/display: fix SUBVP DC_DEBUG_MASK documentation Aric Cyr (2): drm/amd/display: Add hubp cache reset when powergating drm/amd/display: Optimize cursor position updates Arnd Bergmann (1): drm: select DRM_KMS_HELPER from DRM_GEM_SHMEM_HELPER Aurabindo Pillai (1): drm/amd: Add debug option to disable subvp Christian König (2): drm/amdgpu: mark a bunch of module parameters unsafe drm/amdgpu: always sync the GFX pipe on ctx switch Dan Carpenter (1): drm: zynqmp_dp: Unlock on error in zynqmp_dp_bridge_atomic_enable() Emily Deng (1): drm/amdkfd: Fix partial migrate issue Geert Uytterhoeven (1): cgroup/rdma: Drop bogus PAGE_COUNTER select Gui Chengming (1): drm/amdgpu: fix fw attestation for MP0_14_0_{2/3} Jay Cornwall (2): drm/amdkfd: Sync trap handler binary with source drm/amdkfd: Clear MODE.VSKIP in gfx9 trap handler Jesse.zhang@xxxxxxx (3): revert "drm/amdgpu/pm: Implement SDMA queue reset for different asic" revert "drm/amdgpu/pm: add definition PPSMC_MSG_ResetSDMA2" drm/amd/pm: Refactor SMU 13.0.6 SDMA reset firmware version checks Kenneth Feng (1): drm/amdgpu: disable gfxoff with the compute workload on gfx12 Kent Russell (1): drm/amdgpu: Mark debug KFD module params as unsafe Lijo Lazar (4): drm/amdgpu: Add handler for SDMA context empty drm/amdgpu: Refine ip detection log message drm/amd/pm: Add capability flags for SMU v13.0.6 drm/amd/pm: Fix smu v13.0.6 caps initialization Lin.Cao (1): drm/amdgpu: fix ring timeout issue in gfx10 sr-iov environment Maarten Lankhorst (3): drm/modeset: Handle tiled displays in pan_display_atomic. drm/client: Handle tiled displays better Merge remote-tracking branch 'drm/drm-next' into drm-misc-next-fixes Mario Limonciello (1): drm/amd: Clarify kdoc for amdgpu.gttsize Maíra Canal (1): drm/v3d: Assign job pointer to NULL before signaling the fence Shaoyun Liu (1): drm/amd/amdgpu: Enable scratch data dump for mes 12 Simona Vetter (4): Merge v6.13 into drm-next Merge tag 'drm-misc-fixes-2025-01-24' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next Merge tag 'amd-drm-next-6.14-2025-01-24' of https://gitlab.freedesktop.org/agd5f/linux into drm-next Merge tag 'drm-misc-next-fixes-2025-01-24' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next Srinivasan Shanmugam (4): drm/amdgpu: Fix Circular Locking Dependency in AMDGPU GFX Isolation drm/amdgpu/gfx12: Add Cleaner Shader Support for GFX12.0 GPUs drm/amd/display: Fix error pointers in amdgpu_dm_crtc_mem_type_changed drm/amd/amdgpu: Prevent null pointer dereference in GPU bandwidth calculation Thomas Zimmermann (1): drm/bochs: Do not put DRM device in PCI remove callback Tomi Valkeinen (1): drm: xlnx: zynqmp_dpsub: Fix kernel doc Tvrtko Ursulin (1): drm/amdgpu: Use DRM scheduler API in amdgpu_xcp_release_sched Tzung-Bi Shih (1): drm/amd/display: mark static functions noinline_for_stack Vivek Kasireddy (1): drm/virtio: Fix UAF in virtgpu_dma_buf_free_obj() Documentation/gpu/zynqmp.rst | 2 - drivers/gpu/drm/Kconfig | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 156 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 26 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 19 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 8 + drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 49 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 22 + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 2391 +++++++++++++++++++++++------------------------ drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 22 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 + drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c | 12 +- drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 12 +- drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp.c | 10 +- drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c | 6 +- drivers/gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.c | 10 +- drivers/gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.h | 2 + drivers/gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.c | 9 +- drivers/gpu/drm/amd/display/dc/hubp/dcn201/dcn201_hubp.c | 1 + drivers/gpu/drm/amd/display/dc/hubp/dcn21/dcn21_hubp.c | 3 + drivers/gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.c | 3 + drivers/gpu/drm/amd/display/dc/hubp/dcn31/dcn31_hubp.c | 1 + drivers/gpu/drm/amd/display/dc/hubp/dcn32/dcn32_hubp.c | 1 + drivers/gpu/drm/amd/display/dc/hubp/dcn35/dcn35_hubp.c | 1 + drivers/gpu/drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 13 +- drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 2 + drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 2 + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 2 + drivers/gpu/drm/amd/include/amd_pcie.h | 18 + drivers/gpu/drm/amd/include/amd_shared.h | 7 +- drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h | 1 - drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 3 +- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 1 + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 286 ++++-- drivers/gpu/drm/drm_client_modeset.c | 9 + drivers/gpu/drm/drm_fb_helper.c | 14 +- drivers/gpu/drm/tiny/bochs.c | 1 - drivers/gpu/drm/v3d/v3d_irq.c | 16 +- drivers/gpu/drm/virtio/virtgpu_prime.c | 11 +- drivers/gpu/drm/xlnx/zynqmp_dp.c | 3 +- drivers/gpu/drm/xlnx/zynqmp_dpsub.h | 1 + init/Kconfig | 1 - 47 files changed, 1764 insertions(+), 1415 deletions(-) -- Simona Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
