Hi Dave, Sima, Fixes for 6.11. The following changes since commit 627a24f5f25d689682f395f3df1411273be4436b: Merge tag 'amd-drm-fixes-6.11-2024-07-18' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2024-07-22 13:03:50 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-6.11-2024-07-25 for you to fetch changes up to 5659b0c93a1ea02c662a030b322093203f299185: drm/amdgpu: reset vm state machine after gpu reset(vram lost) (2024-07-24 17:30:49 -0400) ---------------------------------------------------------------- amd-drm-fixes-6.11-2024-07-25: amdgpu: - SDMA 5.2 workaround - GFX12 fixes - Uninitialized variable fix - VCN/JPEG 4.0.3 fixes - Misc display fixes - RAS fixes - VCN4/5 harvest fix - GPU reset fix ---------------------------------------------------------------- Alex Deucher (1): drm/amdgpu/sdma5.2: Update wptr registers as well as doorbell David Belanger (1): drm/amdgpu: Fix atomics on GFX12 Jane Jian (1): drm/amdgpu/vcn: Use offsets local to VCN/JPEG in VF Lijo Lazar (2): drm/amdgpu: Add empty HDP flush function to JPEG v4.0.3 drm/amdgpu: Add empty HDP flush function to VCN v4.0.3 Ma Ke (1): drm/amd/amdgpu: Fix uninitialized variable warnings Rodrigo Siqueira (1): drm/amd/display: Remove ASSERT if significance is zero in math_ceil2 Stanley.Yang (1): drm/amdgpu: Fix eeprom max record count Sung Joon Kim (1): drm/amd/display: Check for NULL pointer Tim Huang (1): drm/amdgpu: add missed harvest check for VCN IP v4/v5 YiPeng Chai (1): drm/amdgpu: fix ras UE error injection failure issue ZhenGuo Yin (1): drm/amdgpu: reset vm state machine after gpu reset(vram lost) drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 5 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 3 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 9 ++-- drivers/gpu/drm/amd/amdgpu/df_v4_15.c | 45 ++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/df_v4_15.h | 30 ++++++++++++ drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 27 ++++++++++- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 12 +++++ drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c | 2 +- drivers/gpu/drm/amd/amdgpu/soc24.c | 4 ++ drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 6 +++ drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 54 ++++++++++++++++++++-- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 6 +++ drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 6 +++ drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 3 +- .../src/dml2_standalone_libraries/lib_float_math.c | 2 - .../drm/amd/include/asic_reg/df/df_4_15_offset.h | 28 +++++++++++ .../drm/amd/include/asic_reg/df/df_4_15_sh_mask.h | 28 +++++++++++ 20 files changed, 261 insertions(+), 17 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/df_v4_15.c create mode 100644 drivers/gpu/drm/amd/amdgpu/df_v4_15.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_4_15_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_4_15_sh_mask.h
