Alex Deucher
948ceec7c4
drm/amdgpu/mes: fix format specifier for size_t
...
To avoid a warning on 32 bit.
Reported-by: kernel test robot <lkp@intel.com >
Reviewed-by: Guchun Chen <guchun.chen@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-10 17:53:11 -04:00
Alice Wong
4bef1abe74
drm/amdgpu/psp: Return failure when firmware failed to load in SRIOV
...
In SRIOV, PSP will block incompatible firmware from loading. When this happens,
driver should be prevented from continue initialization and start cleanup.
Return failure in psp_cmd_submit_buf when firmware load failed in SRIOV.
Signed-off-by: Alice Wong <shiwei.wong@amd.com >
Reviewed-by: Sashank Saye <sashank.saye@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-10 17:53:11 -04:00
Graham Sider
3cc69021e5
drm/amdgpu: Implement get_vmid_pasid_mapping for gfx11
...
Implement gmc_v11_0_get_vmid_pasid_mapping_info to fix
gmc_v11_0_flush_gpu_tlb_pasid logic. Change from gfx10 to use
IH_VMID_*_LUT registers for VMID -> PASID mapping.
Signed-off-by: Graham Sider <Graham.Sider@amd.com >
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-10 17:53:11 -04:00
Graham Sider
de4c8a7b02
drm/amdgpu: Disable SDMA WPTR_POLL_ENABLE for sdma_v6_0
...
WPTR_POLL_ENABLE = 1 was kept to support legacy doorbell programming in
SimNow environment. Disable for real hardware.
Signed-off-by: Graham Sider <Graham.Sider@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-10 17:53:11 -04:00
Kenneth Feng
b4e7b0e86f
drm/amd/pm: enable gfxoff control on smu_v13_0_7
...
enable gfxoff control interface on smu_v13_0_7
Signed-off-by: Kenneth Feng <kenneth.feng@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-10 17:53:11 -04:00
Likun Gao
dfc53681de
drm/amdgpu: add sysfs to shows psp vbflash status
...
Add new sysfs interface to shows the status of psp vbflash status.
V2: rename the sysfs interface, and set more return value.
(0: not start; 1: in progress; MBX115 value when vbflash finish)
V3: warning fixes
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-10 17:53:10 -04:00
Likun Gao
8424f2ccb3
drm/amdgpu/psp: Add vbflash sysfs interface support
...
Add sysfs interface to copy VBIOS.
v2: squash in fix for proper vmalloc API (Alex)
Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com >
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-10 17:53:10 -04:00
Andrey Grodzovsky
09fffcd969
drm/amdgpu/psp: Add VBIOS flash handler
...
Add psp vbflash function for psp v13.
v2: fix warnings
Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com >
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-06 16:58:21 -04:00
Yang Li
1e51dbad4b
drm/amdgpu/gfx11: remove unneeded semicolon
...
Eliminate the following coccicheck warning:
./drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c:1222:2-3: Unneeded semicolon
Reported-by: Abaci Robot <abaci@linux.alibaba.com >
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 16:57:57 -04:00
James Zhu
97aa0c184f
drm/amdgpu/vcn4: replace ip based software ring decode with common vcn software ring decode
...
Replace ip based software ring decode with common vcn software ring decode.
Signed-off-by: James Zhu <James.Zhu@amd.com >
Reviewed-by: Christian Koenig <Christian.Koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 16:57:52 -04:00
James Zhu
3d4cfd9e4d
drm/amdgpu/vcn3: replace ip based software ring decode with common vcn software ring decode
...
Replace ip based software ring decode with common vcn software ring decode.
Signed-off-by: James Zhu <James.Zhu@amd.com >
Reviewed-by: Christian Koenig <Christian.Koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 16:57:44 -04:00
James Zhu
60a2e9eecf
drm/amdgpu/vcn: add common vcn sofware ring decode
...
Add common vcn sofware ring decode.
v2: fixed compiling error
Signed-off-by: James Zhu <James.Zhu@amd.com >
Reviewed-by: Christian Koenig <Christian.Koenig@amd.com >
Acked-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 16:57:36 -04:00
Richard Gong
e02fe3bc7a
drm/amdgpu: vi: disable ASPM on Intel Alder Lake based systems
...
Active State Power Management (ASPM) feature is enabled since kernel 5.14.
There are some AMD Volcanic Islands (VI) GFX cards, such as the WX3200 and
RX640, that do not work with ASPM-enabled Intel Alder Lake based systems.
Using these GFX cards as video/display output, Intel Alder Lake based
systems will freeze after suspend/resume.
The issue was originally reported on one system (Dell Precision 3660 with
BIOS version 0.14.81), but was later confirmed to affect at least 4
pre-production Alder Lake based systems.
Add an extra check to disable ASPM on Intel Alder Lake based systems with
the problematic AMD Volcanic Islands GFX cards.
Fixes: 0064b0ce85 ("drm/amd/pm: enable ASPM by default")
Link: https://gitlab.freedesktop.org/drm/amd/-/issues/1885
Signed-off-by: Richard Gong <richard.gong@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 16:57:28 -04:00
Christian König
d54762cc3e
drm/amdgpu: nuke dynamic gfx scratch reg allocation
...
It's over a decade ago that this was actually used for more than ring and
IB tests. Just use the static register directly where needed and nuke the
now useless infrastructure.
Signed-off-by: Christian König <christian.koenig@amd.com >
Acked-by: Lang Yu <Lang.Yu@amd.com >
Acked-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-05-06 16:57:21 -04:00
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