Hi Linus, Regular weekly merge request, mostly amdgpu and misc bits in xe/etnaviv/gma500 and some core changes. Nothing too outlandish, seems to be about normal for this time of release. Regards, Dave. drm-fixes-2024-04-26: drm fixes for 6.9-rc6 atomic-helpers: - Fix memory leak in drm_format_conv_state_copy() fbdev: - fbdefio: Fix address calculation amdgpu: - Suspend/resume fix - Don't expose gpu_od directory if it's empty - SDMA 4.4.2 fix - VPE fix - BO eviction fix - UMSCH fix - SMU 13.0.6 reset fixes - GPUVM flush accounting fix - SDMA 5.2 fix - Fix possible UAF in mes code amdkfd: - Eviction fence handling fix - Fix memory leak when GPU memory allocation fails - Fix dma-buf validation - Fix rescheduling of restore worker - SVM fix gma500: - Fix crash during boot etnaviv: - fix GC7000 TX clock gating - revert NPU UAPI changes xe: - Fix error paths on managed allocations - Fix PF/VF relay messages The following changes since commit ed30a4a51bb196781c8058073ea720133a65596f: Linux 6.9-rc5 (2024-04-21 12:35:54 -0700) are available in the Git repository at: https://gitlab.freedesktop.org/drm/kernel.git tags/drm-fixes-2024-04-26 for you to fetch changes up to 3a8534035c0747610312f9552898a0ece10ef8a7: Merge tag 'drm-xe-fixes-2024-04-25' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes (2024-04-26 12:56:58 +1000) ---------------------------------------------------------------- drm fixes for 6.9-rc6 atomic-helpers: - Fix memory leak in drm_format_conv_state_copy() fbdev: - fbdefio: Fix address calculation amdgpu: - Suspend/resume fix - Don't expose gpu_od directory if it's empty - SDMA 4.4.2 fix - VPE fix - BO eviction fix - UMSCH fix - SMU 13.0.6 reset fixes - GPUVM flush accounting fix - SDMA 5.2 fix - Fix possible UAF in mes code amdkfd: - Eviction fence handling fix - Fix memory leak when GPU memory allocation fails - Fix dma-buf validation - Fix rescheduling of restore worker - SVM fix gma500: - Fix crash during boot etnaviv: - fix GC7000 TX clock gating - revert NPU UAPI changes xe: - Fix error paths on managed allocations - Fix PF/VF relay messages ---------------------------------------------------------------- Alex Deucher (1): drm/amdgpu/sdma5.2: use legacy HDP flush for SDMA2/3 Christian Gmeiner (1): Revert "drm/etnaviv: Expose a few more chipspecs to userspace" Dave Airlie (4): Merge tag 'amd-drm-fixes-6.9-2024-04-24' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Merge tag 'drm-misc-fixes-2024-04-25' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes Merge tag 'drm-etnaviv-fixes-2024-04-25' of https://git.pengutronix.de/git/lst/linux into drm-fixes Merge tag 'drm-xe-fixes-2024-04-25' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes Derek Foreman (1): drm/etnaviv: fix tx clock gating on some GC7000 variants Felix Kuehling (3): drm/amdkfd: Fix eviction fence handling drm/amdgpu: Update BO eviction priorities drm/amdkfd: Fix rescheduling of restore worker Himal Prasad Ghimiray (2): drm/xe: Remove sysfs only once on action add failure drm/xe: call free_gsc_pkt only once on action add failure Jack Xiao (1): drm/amdgpu/mes: fix use-after-free issue Joshua Ashton (1): drm/amd/display: Set color_mgmt_changed to true on unsuspend Lang Yu (2): drm/amdkfd: make sure VM is ready for updating operations drm/amdgpu/umsch: don't execute umsch test when GPU is in reset/suspend Lijo Lazar (2): drm/amdgpu: Assign correct bits for SDMA HDP flush drm/amd/pm: Restore config space after reset Lucas Stach (1): drm/atomic-helper: fix parameter order in drm_format_conv_state_copy() call Ma Jun (1): drm/amdgpu/pm: Remove gpu_od if it's an empty directory Michal Wajdeczko (1): drm/xe/guc: Fix arguments passed to relay G2H handlers Mukul Joshi (2): drm/amdgpu: Fix leak when GPU memory allocation fails drm/amdkfd: Add VRAM accounting for SVM migration Nam Cao (1): fbdev: fix incorrect address computation in deferred IO Patrik Jakobsson (1): drm/gma500: Remove lid code Peyton Lee (1): drm/amdgpu/vpe: fix vpe dpm setup failed Prike Liang (1): drm/amdgpu: Fix the ring buffer size for queue VM flush drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 35 ++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 - drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 3 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 26 ++++--- drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c | 14 ++-- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 16 ++++- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 15 ++-- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 7 ++ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 25 +++++++ drivers/gpu/drm/drm_gem_atomic_helper.c | 4 +- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 24 +------ drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 12 ---- drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 34 --------- drivers/gpu/drm/gma500/Makefile | 1 - drivers/gpu/drm/gma500/psb_device.c | 5 +- drivers/gpu/drm/gma500/psb_drv.h | 9 --- drivers/gpu/drm/gma500/psb_lid.c | 80 ---------------------- drivers/gpu/drm/xe/xe_gt.c | 4 +- drivers/gpu/drm/xe/xe_gt_ccs_mode.c | 19 ++--- drivers/gpu/drm/xe/xe_gt_ccs_mode.h | 2 +- drivers/gpu/drm/xe/xe_guc_ct.c | 4 +- drivers/gpu/drm/xe/xe_huc.c | 9 +-- drivers/video/fbdev/core/fb_defio.c | 2 +- include/uapi/drm/etnaviv_drm.h | 5 -- 32 files changed, 131 insertions(+), 243 deletions(-) delete mode 100644 drivers/gpu/drm/gma500/psb_lid.c