[PATCH] drm/amdgpu/mes: add mes mapping legacy queue switch

[Andrew Worsley]

I tested this patch

On Thu, 22 Aug 2024 at 20:28, Jack Xiao <Jack.Xiao at amd.com> wrote:
>
> For mes11 old firmware has issue to map legacy queue,
> add a flag to switch mes to map legacy queue.
>
> Signed-off-by: Jack Xiao <Jack.Xiao at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c |  4 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h |  1 +
>  drivers/gpu/drm/amd/amdgpu/mes_v11_0.c  | 49 +++++++++++++++++--------
>  drivers/gpu/drm/amd/amdgpu/mes_v12_0.c  |  9 +++--
>  4 files changed, 43 insertions(+), 20 deletions(-)
>
...
with the older firmware on the v6.11-rc4 kernel and it seems to work
fine on my laptop:

% grep amdgpu dmesg-6.11.0-rc4-jack-amw+.txt
[    2.556631] [drm] amdgpu kernel modesetting enabled.
[    2.562758] amdgpu: Virtual CRAT table created for CPU
[    2.563277] amdgpu: Topology: Add CPU node
[    2.575279] amdgpu 0000:c1:00.0: amdgpu: Fetched VBIOS from VFCT
[    2.575756] amdgpu: ATOM BIOS: 113-PHXGENERIC-001
[    2.577651] amdgpu 0000:c1:00.0: Direct firmware load for
amdgpu/gc_11_0_1_mes_2.bin failed with error -2
[    2.578177] amdgpu 0000:c1:00.0: amdgpu: try to fall back to
gc_11_0_1_mes.bin
[    2.579118] amdgpu 0000:c1:00.0: vgaarb: deactivate vga console
[    2.579122] amdgpu 0000:c1:00.0: amdgpu: Trusted Memory Zone (TMZ)
feature enabled
[    2.579197] amdgpu 0000:c1:00.0: amdgpu: VRAM: 2048M
0x0000008000000000 - 0x000000807FFFFFFF (2048M used)
[    2.579202] amdgpu 0000:c1:00.0: amdgpu: GART: 512M
0x00007FFF00000000 - 0x00007FFF1FFFFFFF
[    2.579384] [drm] amdgpu: 2048M of VRAM memory ready
[    2.579389] [drm] amdgpu: 31048M of GTT memory ready.
[    2.605229] amdgpu 0000:c1:00.0: amdgpu: reserve 0x4000000 from
0x8078000000 for PSP TMR
[    3.128536] amdgpu 0000:c1:00.0: amdgpu: RAS: optional ras ta ucode
is not available
[    3.136355] amdgpu 0000:c1:00.0: amdgpu: RAP: optional rap ta ucode
is not available
[    3.136365] amdgpu 0000:c1:00.0: amdgpu: SECUREDISPLAY:
securedisplay ta ucode is not available
[    3.146193] amdgpu 0000:c1:00.0: amdgpu: SMU is initialized successfully!
[    3.258706] kfd kfd: amdgpu: Allocated 3969056 bytes on gart
[    3.258723] kfd kfd: amdgpu: Total number of KFD nodes to be created: 1
[    3.258838] amdgpu: Virtual CRAT table created for GPU
[    3.258978] amdgpu: Topology: Add dGPU node [0x15bf:0x1002]
[    3.258982] kfd kfd: amdgpu: added device 1002:15bf
[    3.258995] amdgpu 0000:c1:00.0: amdgpu: SE 1, SH per SE 2, CU per
SH 6, active_cu_number 12
[    3.259002] amdgpu 0000:c1:00.0: amdgpu: ring gfx_0.0.0 uses VM inv
eng 0 on hub 0
[    3.259006] amdgpu 0000:c1:00.0: amdgpu: ring comp_1.0.0 uses VM
inv eng 1 on hub 0
[    3.259009] amdgpu 0000:c1:00.0: amdgpu: ring comp_1.1.0 uses VM
inv eng 4 on hub 0
[    3.259013] amdgpu 0000:c1:00.0: amdgpu: ring comp_1.2.0 uses VM
inv eng 6 on hub 0
[    3.259016] amdgpu 0000:c1:00.0: amdgpu: ring comp_1.3.0 uses VM
inv eng 7 on hub 0
[    3.259019] amdgpu 0000:c1:00.0: amdgpu: ring comp_1.0.1 uses VM
inv eng 8 on hub 0
[    3.259022] amdgpu 0000:c1:00.0: amdgpu: ring comp_1.1.1 uses VM
inv eng 9 on hub 0
[    3.259026] amdgpu 0000:c1:00.0: amdgpu: ring comp_1.2.1 uses VM
inv eng 10 on hub 0
[    3.259029] amdgpu 0000:c1:00.0: amdgpu: ring comp_1.3.1 uses VM
inv eng 11 on hub 0
[    3.259032] amdgpu 0000:c1:00.0: amdgpu: ring sdma0 uses VM inv eng
12 on hub 0
[    3.259035] amdgpu 0000:c1:00.0: amdgpu: ring vcn_unified_0 uses VM
inv eng 0 on hub 8
[    3.259038] amdgpu 0000:c1:00.0: amdgpu: ring jpeg_dec uses VM inv
eng 1 on hub 8
[    3.259041] amdgpu 0000:c1:00.0: amdgpu: ring mes_kiq_3.1.0 uses VM
inv eng 13 on hub 0
[    3.267498] amdgpu 0000:c1:00.0: amdgpu: Runtime PM not available
[    3.268055] [drm] Initialized amdgpu 3.58.0 for 0000:c1:00.0 on minor 0
[    3.280095] fbcon: amdgpudrmfb (fb0) is primary device
[    4.194462] amdgpu 0000:c1:00.0: [drm] fb0: amdgpudrmfb frame buffer device
[   22.685627] snd_hda_intel 0000:c1:00.1: bound 0000:c1:00.0 (ops
amdgpu_dm_audio_component_bind_ops [amdgpu])

Thanks Jack

Andrew