[Public]

These merged into 6.1.7 from Sasha: drm/amdgpu: add soc21 common ip block support for GC 11.0.4 drm/amdgpu: Enable pg/cg flags on GC11_0_4 for VCN

So here is an updated series of what's left:

69dc98bbd441 ("drm/amdgpu/discovery: enable soc21 common for GC 11.0.4") d5fd8c89ed20 ("drm/amdgpu/discovery: enable gmc v11 for GC 11.0.4") b952d6b3d3ff ("drm/amdgpu/discovery: enable gfx v11 for GC 11.0.4") 6a6af77570ad ("drm/amdgpu/discovery: enable mes support for GC v11.0.4") 94ab70685844 ("drm/amdgpu: set GC 11.0.4 family") dd2d9c7fd771 ("drm/amdgpu/discovery: set the APU flag for GC 11.0.4") 1763cb65e870 ("drm/amdgpu: add gfx support for GC 11.0.4") d0ca8248999e ("drm/amdgpu: add gmc v11 support for GC 11.0.4") 7c1389f1b122 ("drm/amdgpu/discovery: add PSP IP v13.0.11 support") 16412a94364d ("drm/amdgpu/pm: enable swsmu for SMU IP v13.0.11") 51e7a2168769 ("drm/amdgpu: add smu 13 support for smu 13.0.11") 9f83e61201bb ("drm/amdgpu/pm: add GFXOFF control IP version check for SMU IP v13.0.11") 18ad18853cf2 ("drm/amdgpu/soc21: add mode2 asic reset for SMU IP v13.0.11") 069a5af97ce3 ("drm/amdgpu/pm: use the specific mailbox registers only for SMU IP v13.0.4") 7308ceb44663 ("drm/amdgpu/discovery: enable nbio support for NBIO v7.7.1") 2c83e3fd928b ("drm/amdgpu: enable PSP IP v13.0.11 support") f2b91e5a7cc0 ("drm/amdgpu: enable GFX IP v11.0.4 CG support") a89e2965da6e ("drm/amdgpu: enable GFX Power Gating for GC IP v11.0.4") f9caa237372b ("drm/amdgpu: enable GFX Clock Gating control for GC IP v11.0.4") 97074216917b ("drm/amdgpu: add tmz support for GC 11.0.1") 2aecbe492a3c ("drm/amdgpu: add tmz support for GC IP v11.0.4")

-----Original Message----- From: Limonciello, Mario Sent: Monday, January 16, 2023 13:27 To: stable@vger.kernel.org Cc: Gong, Richard Richard.Gong@amd.com Subject: Minor changes for supporting products with GC 11.0.4

[Public]

Hi,

AMDGPU changed the codebase to use IP block versions rather than device IDs. Some products that contain IP blocks "GC 11.0.4", "PSP 13.0.11" and "NBIO 7.7.1" work with the code in 6.1.y, but the various switch/case statements for IP version match are missing for these.

So the following minor changes allow those products to work with acceleration on 6.1.y:

69dc98bbd441 ("drm/amdgpu/discovery: enable soc21 common for GC 11.0.4") d5fd8c89ed20 ("drm/amdgpu/discovery: enable gmc v11 for GC 11.0.4") b952d6b3d3ff ("drm/amdgpu/discovery: enable gfx v11 for GC 11.0.4") 6a6af77570ad ("drm/amdgpu/discovery: enable mes support for GC v11.0.4") 94ab70685844 ("drm/amdgpu: set GC 11.0.4 family") dd2d9c7fd771 ("drm/amdgpu/discovery: set the APU flag for GC 11.0.4") 1763cb65e870 ("drm/amdgpu: add gfx support for GC 11.0.4") 311d52367d0a ("drm/amdgpu: add soc21 common ip block support for GC 11.0.4") d0ca8248999e ("drm/amdgpu: add gmc v11 support for GC 11.0.4") 7c1389f1b122 ("drm/amdgpu/discovery: add PSP IP v13.0.11 support") 16412a94364d ("drm/amdgpu/pm: enable swsmu for SMU IP v13.0.11") 51e7a2168769 ("drm/amdgpu: add smu 13 support for smu 13.0.11") 9f83e61201bb ("drm/amdgpu/pm: add GFXOFF control IP version check for SMU IP v13.0.11") 18ad18853cf2 ("drm/amdgpu/soc21: add mode2 asic reset for SMU IP v13.0.11") 069a5af97ce3 ("drm/amdgpu/pm: use the specific mailbox registers only for SMU IP v13.0.4") 7308ceb44663 ("drm/amdgpu/discovery: enable nbio support for NBIO v7.7.1") 2a0fe2ca6e9c ("drm/amdgpu: Enable pg/cg flags on GC11_0_4 for VCN") 2c83e3fd928b ("drm/amdgpu: enable PSP IP v13.0.11 support") f2b91e5a7cc0 ("drm/amdgpu: enable GFX IP v11.0.4 CG support") a89e2965da6e ("drm/amdgpu: enable GFX Power Gating for GC IP v11.0.4") f9caa237372b ("drm/amdgpu: enable GFX Clock Gating control for GC IP v11.0.4") 97074216917b ("drm/amdgpu: add tmz support for GC 11.0.1") 2aecbe492a3c ("drm/amdgpu: add tmz support for GC IP v11.0.4")

Can these please be brought into 6.1.y? As amdgpu switched from device IDs to IP blocks these are akin to "device ID" support.

Thanks,