Alex Deucher
bf1781e17f
drm/amdgpu: simplify nv and soc21 read_register functions
...
Check of the base offset for the IP exists rather than
explicitly checking for how many instances of a particular
IP there are. This is what soc15.c already does. Expand
this to nv.c and soc21.c.
Acked-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 16:56:57 -04:00
Yiqing Yao
98f5618846
drm/amdgpu: flush delete wq after wait fence
...
[why]
lru_list not empty warning in sw fini during repeated device bind unbind.
There should be a amdgpu_fence_wait_empty() before the flush_delayed_work()
call as Christian suggested.
[how]
Move to do flush_delayed_work for ttm bo delayed delete wq after fence_driver_hw_fini.
Tested by: Yiqing Yao <yiqing.yao@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Yiqing Yao <yiqing.yao@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 16:56:41 -04:00
Huang Rui
f333c9c6f5
drm/amdgpu/discovery: enable mes support for GC v11.0.1
...
GC v11.0.1 is using MES v11, so add IP block.
Signed-off-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Xiaojian Du <Xiaojian.Du@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:15 -04:00
Huang Rui
10eab4e7d7
drm/amdgpu/discovery: enable gfx v11 for GC 11.0.1
...
Enable gfx v11 for GC 11.0.1.
Signed-off-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:15 -04:00
Huang Rui
7319c14fb0
drm/amdgpu: enable imu firmware for GC 11.0.1
...
The GC 11.0.1 needs load IMU to power up the GFX before loads GFX
firmware.
Signed-off-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Tim Huang <Tim.Huang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:15 -04:00
Huang Rui
b0abae7d5d
drm/amdgpu: add GC v11.0.1 into mes v11
...
Add GC v11.0.1 support into mes v11.
Signed-off-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Xiaojian Du <Xiaojian.Du@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:14 -04:00
Huang Rui
2e5dbc1b05
drm/amdgpu: add gfx support for GC 11.0.1
...
Add GC 11.0.1 gfx support to gfx11 implementation.
v2: squash in golden regs
Signed-off-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:14 -04:00
Alex Deucher
921173e24d
drm/amdgpu/discovery: set flag for GC 11.0.1
...
Set the APU flag appropriately for GC 11.0.1.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:14 -04:00
Huang Rui
2375271493
drm/amdgpu: set GC 11.0.1 family
...
Add GC 11.0.1 family support.
Signed-off-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:14 -04:00
Huang Rui
500448dce2
drm/amdgpu/discovery: enable sdma v6 for SDMA 6.0.1
...
Enable sdma (system dma) v6 for SDMA 6.0.1.
Signed-off-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:14 -04:00
Huang Rui
04dd809b6f
drm/amdgpu: add sdma support for sdma 6.0.1
...
Add sdma 6.0.1 support to sdma6 implementation.
Signed-off-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:14 -04:00
Xiaojian Du
bed95cfdc5
drm/amdgpu/discovery: add PSP v13.0.4 into the IP discovery list
...
This patch will add PSP v13.0.4 into the IP discovery list.
Signed-off-by: Xiaojian Du <Xiaojian.Du@amd.com >
Reviewed-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:14 -04:00
Huang Rui
48858a101e
drm/amdgpu/discovery: enable ih v6 for OSS 6.0.1
...
Enable ih (interrupt handler) v6 for OSS 6.0.1.
Signed-off-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:14 -04:00
Huang Rui
a8f24139cc
drm/amdgpu/discovery: enable gmc v11 for GC 11.0.1
...
Enable gmc (graphic memory controller) v11 for GC 11.0.1.
Signed-off-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:14 -04:00
Huang Rui
ee367aed75
drm/amdgpu: add gmc v11 support for GC 11.0.1
...
Add gmc v11 support for GC 11.0.1.
Signed-off-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:14 -04:00
Huang Rui
6e4eb7ce1f
drm/amdgpu/discovery: enable soc21 common for GC 11.0.1
...
Enable soc21 common for GC 11.0.1.
Signed-off-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:14 -04:00
Huang Rui
11417a927b
drm/amdgpu: add soc21 common ip block support for GC 11.0.1
...
Add common soc21 ip block support for GC 11.0.1.
Signed-off-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:14 -04:00
Huang Rui
50e9f54de4
drm/amdgpu: add mmhub support for MMHUB 3.0.1
...
Add the mmhub support for MMHUB 3.0.1.
Signed-off-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:14 -04:00
Xiaojian Du
6e9e59e26f
drm/amdgpu/discovery: add HDP v5.2.1 into the IP discovery list
...
This patch is to add HDP v5.2.1 in the IP discovery list.
Signed-off-by: Xiaojian Du <Xiaojian.Du@amd.com >
Reviewed-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:14 -04:00
Xiaojian Du
78039df8e8
drm/amdgpu: add the files of HDP v5.2 block
...
This patch is to add the files of HDP v5.2 block.
HDP (Host Data Port) is the IP which handles
host access to VRAM via the PCI BAR.
Signed-off-by: Xiaojian Du <Xiaojian.Du@amd.com >
Reviewed-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:13 -04:00
Xiaojian Du
0c1e5527e0
drm/admgpu/discovery: add NBIO v7.7 into the IP discovery list
...
This patch is to add NBIO v7.7 into the IP discovery list.
Signed-off-by: Xiaojian Du <Xiaojian.Du@amd.com >
Reviewed-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:13 -04:00
Xiaojian Du
810ecd4001
drm/amdgpu: add the files of NBIO v7.7 block
...
This patch is to add the files of NBIO v7.7 block.
NBIO (New Bus IO) is the block which handles
the GPU interface to the PCIe bus.
v2: squash in register name fix (Xiaojian)
Signed-off-by: Xiaojian Du <Xiaojian.Du@amd.com >
Reviewed-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:13 -04:00
Xiaojian Du
bafd6cbe4a
drm/amdgpu: add pcie port function helpers for SOC21
...
These helpers will be used on NBIO v7.7.0.
Signed-off-by: Xiaojian Du <Xiaojian.Du@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:13 -04:00
Xiaojian Du
f5d990d612
drm/amdgpu: skip the new gc doorbell function for some asics
...
This patch will skip the new gc doorbell function for some asics,
only enable new doorbell model on aisc where it is supported.
Signed-off-by: Xiaojian Du <Xiaojian.Du@amd.com >
Reviewed-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:13 -04:00
Xiaojian Du
06aeb75332
drm/amdgpu: handle asics with 1 SDMA instance
...
This patch will handle asics with 1 SDMA instance.
Signed-off-by: Xiaojian Du <Xiaojian.Du@amd.com >
Reviewed-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 10:36:13 -04:00
Dave Airlie
b900352f9d
Merge tag 'amd-drm-next-5.19-2022-04-29' of https://gitlab.freedesktop.org/agd5f/linux into drm-next
...
amd-drm-next-5.19-2022-04-29:
amdgpu
- RAS updates
- SI dpm deadlock fix
- Misc code cleanups
- HDCP fixes
- PSR fixes
- DSC fixes
- SDMA doorbell cleanups
- S0ix fix
- DC FP fix
- Zen dom0 regression fix for APUs
- IP discovery updates
- Initial SoC21 support
- Support for new vbios tables
- Runtime PM fixes
- Add PSP TA debugfs interface
amdkfd:
- Misc code cleanups
- Ignore bogus MEC signals more efficiently
- SVM fixes
- Use bitmap helpers
radeon:
- Misc code cleanups
- Spelling/grammer fixes
From: Alex Deucher <alexander.deucher@amd.com >
Link: https://patchwork.freedesktop.org/patch/msgid/20220429144853.5742-1-alexander.deucher@amd.com
2022-05-06 15:05:27 +10:00
Kenneth Feng
27e3911c40
drm/amd/soc21: enable mmhub and athub power gating
...
add the pg_flag for athub and mmhub pg.
Signed-off-by: Kenneth Feng <kenneth.feng@amd.com >
Reviewed-by: Jack Gui <Jack.Gui@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:53:44 -04:00
Likun Gao
9503a944e7
drm/amdgpu: enable cgcg and cgls for GC 11_0_2
...
Enable GFX CGCG and CGLS for GFX v11_0_2.
Signed-off-by: Likun Gao <Likun.Gao@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:53:00 -04:00
Flora Cui
30ca5b2b6b
drm/amdgpu/discovery: set family for GC 11.0.2
...
Set AMDGPU_FAMILY_GC_11_0_0.
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Flora Cui <flora.cui@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:52:57 -04:00
Flora Cui
af6958492a
drm/amdgpu/discovery: add gfx11 support for GC 11.0.2
...
Enable gfx11 support.
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Flora Cui <flora.cui@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:52:54 -04:00
Likun Gao
84f5670737
drm/amdgpu: update rlc ram for gc v11_0_2
...
Add imu rlc ram register settings for gc v11_0_2
Signed-off-by: Likun Gao <Likun.Gao@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:52:50 -04:00
Flora Cui
1366018e01
drm/amdgpu: add initial GC 11.0.2 support
...
Add initial support for GC 11.0.2 to gfx_v11_0.c.
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Flora Cui <flora.cui@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:52:46 -04:00
Flora Cui
621e87875c
drm/amdgpu: add gc v11_0_2 imu firmware
...
add gc v11_0_2 imu firmware
Signed-off-by: Flora Cui <flora.cui@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:52:42 -04:00
Flora Cui
215a65f5d1
drm/amdgpu/discovery: add mes11 support for GC 11.0.2
...
Enable Micro Engine Scheduler support.
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Flora Cui <flora.cui@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:52:39 -04:00
Flora Cui
32697fea3a
drm/amdgpu: add mes 11 firmware for mes 11.0.2
...
Define firmware for MES 11.0.2.
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Flora Cui <flora.cui@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:52:37 -04:00
Flora Cui
63b170806b
drm/amdgpu/discovery: add sdma6 support for SDMA 6.0.2
...
Enable sdma6 support.
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Flora Cui <flora.cui@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:52:35 -04:00
Flora Cui
c233f3fac7
drm/amdgpu: add sdma 6.0.2 firware support
...
define sdma 6.0.2 firmware.
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Flora Cui <flora.cui@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:52:29 -04:00
James Zhu
3a65fbc0a3
drm/amdgpu/discovery: enable vcn/jpeg v4_0_4
...
Enable vcn/jpeg 4_0_4.
Signed-off-by: James Zhu <James.Zhu@amd.com >
Reviewed-by: Sonny Jiang <sonny.jiang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:52:27 -04:00
Sonny Jiang
f963052b55
drm/amdgpu: Enable vcn v4_0_4 sram
...
enable vcn v4_0_4 sram
Signed-off-by: Sonny Jiang <sonjiang@amd.com >
Reviewed-by: Leo Liu <leo.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:52:24 -04:00
James Zhu
ec9db74e1a
drm/amdgpu/vcn: enable VCN DPG mode for VCN4_0_4
...
Enable VCN DPG mode for VCN4_0_4.
Signed-off-by: James Zhu <James.Zhu@amd.com >
Reviewed-by: Sonny Jiang <sonny.jiang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:52:21 -04:00
James Zhu
143a34a0ac
drm/amdgpu/vcn: enable VCN PG for VCN4_0_4
...
Enable VCN PG for VCN4_0_4.
Signed-off-by: James Zhu <James.Zhu@amd.com >
Reviewed-by: Sonny Jiang <sonny.jiang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:52:18 -04:00
James Zhu
7ece9314a4
drm/amdgpu/vcn: enable VCN CG for VCN4_0_4
...
Enable VCN CG for VCN4_0_4.
Signed-off-by: James Zhu <James.Zhu@amd.com >
Reviewed-by: Sonny Jiang <sonny.jiang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:52:16 -04:00
James Zhu
ebac66a328
drm/amdgpu/jpeg: enable JPEG PG for VCN4_0_4
...
Enable JPEG PG for VCN4_0_4.
Signed-off-by: James Zhu <James.Zhu@amd.com >
Reviewed-by: Sonny Jiang <sonny.jiang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:52:14 -04:00
James Zhu
71dae22143
drm/amdgpu/jpeg: enable JPEG CG for VCN4_0_4
...
Enable JPEG CG for VCN4_0_4.
Signed-off-by: James Zhu <James.Zhu@amd.com >
Reviewed-by: Sonny Jiang <sonny.jiang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:52:12 -04:00
James Zhu
fbd23b5598
drm/amdgpu: add VCN4_0_4 firmware
...
Add VCN4_0_4 firmware.
Signed-off-by: James Zhu <James.Zhu@amd.com >
Reviewed-by: Sonny Jiang <sonny.jiang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:52:10 -04:00
Chengming Gui
5681e8009d
drm/amdgpu/discovery: add psp13 support for PSP 13.0.7
...
Enable psp 13 support.
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Chengming Gui <Jack.Gui@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:52:07 -04:00
Chengming Gui
438a937d9a
drm/amdgpu/psp13: add support for MP0 13.0.7
...
Enable support in psp code.
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Chengming Gui <Jack.Gui@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:52:05 -04:00
Flora Cui
eee5ed4241
drm/amdgpu/discovery: add gmc11 support for GC 11.0.2
...
Enable gmc11 support.
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Flora Cui <flora.cui@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:51:58 -04:00
Flora Cui
f2754bf7e0
drm/amdgpu: add GMC11 support for GC 11.0.2
...
Add initial support for GC 11.0.2.
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Flora Cui <flora.cui@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:51:56 -04:00
Flora Cui
89ae779b49
drm/amdgpu: add UMC 8.11.0 support
...
Add initial support for UMC 8.11.0.
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Flora Cui <flora.cui@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-05 16:51:54 -04:00