Lijo Lazar
cab7d478da
drm/amdgpu: Add IP instance map for aqua vanjaram
...
Add XCC logical to physical instance map for aqua vanjaram
v2:
Keep look up table only for required IPs, for others return
default mapping (Felix).
Signed-off-by: Lijo Lazar <lijo.lazar@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Reviewed-by: Le Ma <Le.Ma@amd.com >
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 09:47:23 -04:00
Alex Deucher
0e5f625157
drm/amdgpu: drop unused function
...
amdgpu_discovery_get_ip_version() has not been used since
commit c40bdfb2ff ("drm/amdgpu: fix incorrect VCN revision in SRIOV")
so drop it.
Reviewed-by: Luben Tuikov <luben.tuikov@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 09:31:31 -04:00
Alex Deucher
29551fd90e
drm/amdgpu: drop invalid IP revision
...
This was already fixed and dropped in:
commit baf3f8f374 ("drm/amdgpu: handle SRIOV VCN revision parsing")
commit c40bdfb2ff ("drm/amdgpu: fix incorrect VCN revision in SRIOV")
But seems to have been accidently been left around in a merge.
Reviewed-by: Luben Tuikov <luben.tuikov@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 09:31:04 -04:00
Srinivasan Shanmugam
7abac457ba
drm/amd/amdgpu: Fix style issues in amdgpu_discovery.c
...
Fix following checkpatch errors in amdgpu_discovery.c
ERROR: space required after that ',' (ctx:VxV)
ERROR: space required before the open parenthesis '('
ERROR: code indent should use tabs where possible
Cc: Christian König <christian.koenig@amd.com >
Cc: Alex Deucher <alexander.deucher@amd.com >
Cc: Mario Limonciello <mario.limonciello@amd.com >
Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-04-21 08:49:37 -04:00
Hawking Zhang
5e5d4b39ce
drm/amdgpu: add common ip block for GC 9.4.3
...
Add common IP handling for GC 9.4.3
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com >
Reviewed-by: Le Ma <Le.Ma@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-04-14 13:47:49 -04:00
Hawking Zhang
69bacf1545
drm/amdgpu: add GMC ip block for GC 9.4.3
...
Add GMC IP handling for GC 9.4.3
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com >
Reviewed-by: Le Ma <Le.Ma@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-03-31 11:18:43 -04:00
Hawking Zhang
f3409f76a6
drm/amdgpu: Set family for GC 9.4.3
...
Set family for GC 9.4.3
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com >
Reviewed-by: Le Ma <Le.Ma@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-03-31 11:18:43 -04:00
Hawking Zhang
5d55e1d02a
drm/amdgpu: init nbio v7_9 callbacks
...
switch to the new nbio generation for NBIO 7.9.0.
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com >
Reviewed-by: Le Ma <Le.Ma@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-03-31 11:18:43 -04:00
Jane Jian
bf35dbc135
drm/amdgpu/jpeg: enable jpeg v4_0 for sriov
...
- skip direct jpeg registers read&write since it is not allowed
- reset Doorbell range layout for sriov
Signed-off-by: Jane Jian <Jane.Jian@amd.com >
Acked-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-03-22 00:47:59 -04:00
Hawking Zhang
a32d7d6b19
drm/amdgpu: add PSP ip block for PSP 13.0.6
...
Add PSP IP handling for PSP 13.0.6
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com >
Reviewed-by: Le Ma <Le.Ma@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-03-07 14:21:57 -05:00
Le Ma
051ae8d59c
drm/amdgpu: set sdma v4_4_2 ip block
...
Use sdma 4.4.2 IP block for chips with sdma 4.4.2 hardware.
Signed-off-by: Le Ma <le.ma@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-03-07 14:21:57 -05:00
Hawking Zhang
4688940a1e
drm/amdgpu: add HDP ip block for HDP 4.4.2
...
Add HDP IP handling for HDP 4.4.2
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com >
Reviewed-by: Le Ma <Le.Ma@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-03-07 14:21:56 -05:00
Hawking Zhang
0df2032ab7
drm/amdgpu: add IH ip block for IH 4.4.2
...
Add IH IP handling for IH 4.4.2
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com >
Reviewed-by: Le Ma <Le.Ma@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-03-07 14:21:56 -05:00
Candice Li
2b595659d5
drm/amdgpu: Support umc node harvest config on umc v8_10
...
Don't need to query error count and error address on harvest umc nodes.
v2: Fix code bug, use active_mask instead of harvsest_config
and remove unnecessary argument in LOOP macro.
v3: Leave adev->gmc.num_umc unchanged.
Signed-off-by: Candice Li <candice.li@amd.com >
Reviewed-by: Tao Zhou <tao.zhou1@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-03-06 15:14:39 -05:00
Thomas Weißschuh
b2daaa9360
drm/amdgpu: make kobj_type structures constant
...
Since commit ee6d3dd4ed ("driver core: make kobj_type constant.")
the driver core allows the usage of const struct kobj_type.
Take advantage of this to constify the structure definitions to prevent
modification at runtime.
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-02-23 17:35:59 -05:00
Candice Li
e4f665de41
drm/amdgpu: Add poison mode query for df v4_3
...
Add poison mode query support on df v4_3.
Signed-off-by: Candice Li <candice.li@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-12-15 12:19:30 -05:00
Yifan Zhang
7308ceb446
drm/amdgpu/discovery: enable nbio support for NBIO v7.7.1
...
this patch is to enable nbio support for NBIO v7.7.1.
Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-11-29 11:03:37 -05:00
Yifan Zhang
51e7a21687
drm/amdgpu: add smu 13 support for smu 13.0.11
...
this patch to add smu 13 support for smu 13.0.11.
Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-11-29 11:03:37 -05:00
Yifan Zhang
dd2d9c7fd7
drm/amdgpu/discovery: set the APU flag for GC 11.0.4
...
Set the APU flag appropriately for GC 11.0.4.
Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-11-29 11:03:36 -05:00
Yifan Zhang
94ab706858
drm/amdgpu: set GC 11.0.4 family
...
this patch is to set GC 11.0.4 family.
Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-11-29 11:03:36 -05:00
Tim Huang
7c1389f1b1
drm/amdgpu/discovery: add PSP IP v13.0.11 support
...
Add PSP IP v13.0.11 ip discovery support.
Signed-off-by: Tim Huang <tim.huang@amd.com >
Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-11-29 11:03:36 -05:00
Yifan Zhang
6a6af77570
drm/amdgpu/discovery: enable mes support for GC v11.0.4
...
this patch is to enable mes for GC 11.0.4.
Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-11-29 11:03:36 -05:00
Yifan Zhang
b952d6b3d3
drm/amdgpu/discovery: enable gfx v11 for GC 11.0.4
...
Enable gfx v11 for GC 11.0.4.
Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-11-29 11:03:36 -05:00
Yifan Zhang
d5fd8c89ed
drm/amdgpu/discovery: enable gmc v11 for GC 11.0.4
...
Enable gmc (graphic memory controller) v11 for GC 11.0.4.
Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-11-29 11:03:36 -05:00
Yifan Zhang
69dc98bbd4
drm/amdgpu/discovery: enable soc21 common for GC 11.0.4
...
Enable soc21 common for GC 11.0.4.
Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com >
Reviewed-by: Aaron Liu <aaron.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-11-29 11:03:36 -05:00
Ren Zhijie
b7a3260c73
drm/amdgpu: fix unused-function error
...
If CONFIG_DRM_AMDGPU=y and CONFIG_DRM_AMD_DC is not set,
gcc complained about unused-function :
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c:1705:13: error: ‘amdgpu_discovery_set_sriov_display’ defined but not used [-Werror=unused-function]
static void amdgpu_discovery_set_sriov_display(struct amdgpu_device *adev)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
To fix this error, use CONFIG_DRM_AMD_DC to wrap
the definition of amdgpu_discovery_set_sriov_display().
Fixes: 25263da376 ("drm/amdgpu: rework SR-IOV virtual display handling")
Signed-off-by: Ren Zhijie <renzhijie2@huawei.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-11-23 10:31:30 -05:00
Perry Yuan
5e0f4c041c
drm/amdgpu: add Vangogh APU flag to IP discovery path
...
Add the missing apu flag for Vangogh when using IP discovery code path
to initialize IPs
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Perry Yuan <Perry.Yuan@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-11-15 13:35:15 -05:00
Alex Deucher
25263da376
drm/amdgpu: rework SR-IOV virtual display handling
...
virtual display is enabled unconditionally in SR-IOV, but
without specifying the virtual_display module, the number
of crtcs defaults to 0. Set a single display by default
for SR-IOV if the virtual_display parameter is not set.
Only enable virtual display by default on SR-IOV on asics
which actually have display hardware.
Acked-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-11-15 11:51:32 -05:00
Yifan Zhang
7701d10a1e
drm/amdgpu: force read discovery file if set discovery=2
...
If discovery is set to 2 in module parameters explicitly, the
intention is to use the discovery file in FW rather than the one in
BIOS, usually because the latter is incorrect. This patch to force
read discovery file if set discovery=2.
Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com >
Reviewed-by: Tim Huang <Tim.Huang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-11-10 15:29:05 -05:00
Le Ma
a79852a393
drm/amdgpu: correct the memcpy size for ip discovery firmware
...
Use fw->size instead of discovery_tmr_size for fallback path.
Signed-off-by: Le Ma <le.ma@amd.com >
Acked-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-09-29 09:44:02 -04:00
Jane Jian
aa44beb5f0
drm/amdgpu/vcn: Add sriov VCN v4_0 unified queue support
...
Enable unified queue support for sriov, abandon all previous
multi-queue settings
Acked-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Jane Jian <Jane.Jian@amd.com >
Reviewed-by: Ruijing Dong <ruijing.dong@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-09-01 15:12:07 -04:00
Horace Chen
dc5f3829a7
drm/amdgpu: sriov remove vcn_4_0 and jpeg_4_0
...
SRIOV needs to initialize mmsch instead of multimedia engines
directly. So currently remove them for SR-IOV until the code and
firmwares are ready.
Acked-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Horace Chen <horace.chen@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-09-01 15:11:18 -04:00
Horace Chen
119dc6c50e
drm/amdgpu: add sriov nbio callback structure
...
[Why]
under SR-IOV, the nbio doorbell range will be defined by PF. So VF
nbio doorbell range registers will be blocked. It will cause violation
if VF access those registers directly.
[How]
create an nbio_v4_3_sriov_funcs for sriov nbio_v4_3 initialization to
skip the setting for the doorbell range registers.
Acked-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Horace Chen <horace.chen@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-09-01 15:11:00 -04:00
Hawking Zhang
e7c69a27cb
drm/amdgpu: add new ip block for MES 11.0.3
...
Add ip block support for mes v11_0_3.
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com >
Reviewed-by: Frank Min <Frank.Min@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-08-30 16:37:28 -04:00
Hawking Zhang
a4d002d7d0
drm/amdgpu: add new ip block for GFX 11.0
...
Add ip block support for gfx v11_0_3.
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com >
Reviewed-by: Frank Min <Frank.Min@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-08-30 16:37:25 -04:00
Hawking Zhang
2b5692345f
drm/amdgpu: Set GC family for GC 11.0.3
...
Set AMDGPU_FAMILY_GC_11_0_0.
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com >
Reviewed-by: Frank Min <Frank.Min@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-08-30 16:37:21 -04:00
Hawking Zhang
94ac32338e
drm/amdgpu: add new ip block for GMC 11.0
...
Add ip block support for gmc v11_0_3.
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com >
Reviewed-by: Frank Min <Frank.Min@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-08-30 16:37:00 -04:00
Hawking Zhang
de2b2ae34d
drm/amdgpu: add new ip block for LSDMA 6.0
...
Add ip block support for lsdma v6_0_3.
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com >
Reviewed-by: Frank Min <Frank.Min@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-08-29 18:00:54 -04:00
Hawking Zhang
5bb7173566
drm/amdgpu: add new ip block for sdma 6.0
...
Add ip block support for sdma v6_0_3.
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com >
Reviewed-by: Frank Min <Frank.Min@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-08-29 18:00:54 -04:00
John Clements
773562364a
drm/amdgpu: enable smu block for smu 13.0.10
...
Force to enable smu block for SMU v13.0.10
Signed-off-by: John Clements <john.clements@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-08-29 18:00:54 -04:00
Frank Min
a60d219137
drm/amdgpu: add new ip block for PSP 13.0
...
Add ip block support for psp v13_0_10.
Signed-off-by: Frank Min <Frank.Min@amd.com >
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-08-29 17:59:30 -04:00
Hawking Zhang
fc968efdf0
drm/amdgpu: add new ip block for SOC21
...
Add ip block support for soc21_common.
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com >
Reviewed-by: Frank Min <Frank.Min@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-08-29 17:59:30 -04:00
Xiaojian Du
7e8a3ca972
drm/amdgpu: enable support for psp 13.0.4 block
...
This patch will enable support for psp 13.0.4 blcok.
Signed-off-by: Xiaojian Du <Xiaojian.Du@amd.com >
Reviewed-by: Tim Huang <Tim.Huang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-07-29 15:24:38 -04:00
Roman Li
869b10ac8d
drm/amdgpu: add dm ip block for dcn 3.1.4
...
Adding dm ip block to enable display on dcn 3.1.4.
Signed-off-by: Roman Li <Roman.Li@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-07-25 09:31:02 -04:00
Alex Deucher
98a90f1f0f
drm/amdgpu: use the same HDP flush registers for all nbio 2.3.x
...
Align RDNA2.x with other asics. One HDP bit per SDMA instance,
aligned with firmware. This is effectively a revert of
commit 369b7d04ba ("drm/amdgpu/nbio2.3: don't use GPU_HDP_FLUSH bit 12").
On further discussions with the relevant hardware teams,
re-align the bits for SDMA.
Fixes: 369b7d04ba ("drm/amdgpu/nbio2.3: don't use GPU_HDP_FLUSH bit 12")
Reviewed-by: Kent Russell <kent.russell@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-07-18 16:42:18 -04:00
Alex Deucher
912db6a587
drm/amdgpu: use the same HDP flush registers for all nbio 7.4.x
...
Align aldebaran with all other asics. One HDP bit per
SDMA instance, aligned with firmware. This is effectively
a revert of
commit a0f9f85466 ("drm/amdgpu/nbio7.4: don't use GPU_HDP_FLUSH bit 12").
On further discussions with the relevant hardware teams,
re-align the bits for SDMA.
Fixes: a0f9f85466 ("drm/amdgpu/nbio7.4: don't use GPU_HDP_FLUSH bit 12")
Reviewed-by: Kent Russell <kent.russell@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-07-18 16:41:55 -04:00
Yifan Zhang
0081bc0728
drm/amdgpu: add LSDMA block for LSDMA v6.0.1
...
This patch adds LSDMA ip block for LSDMA v6.0.1.
Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-06-21 18:17:22 -04:00
Yifan Zhang
438eac25d0
drm/amdgpu/discovery: enable vcn/jpeg v4_0_2
...
Enable vcn/jpeg 4_0_2.
Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Reviewed-by: Tim Huang <Tim.Huang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-06-14 21:38:39 -04:00
Evan Quan
62f8f5c3bf
drm/amdgpu: enable ASPM support for PCIE 7.4.0/7.6.0
...
Enable ASPM support for PCIE 7.4.0 and 7.6.0.
Signed-off-by: Evan Quan <evan.quan@amd.com >
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2022-06-08 11:43:00 -04:00
Alex Deucher
031ac4e419
drm/amdgpu/discovery: add comments about VCN instance handling
...
Add comments to clarify code that is safe, but triggers and
smatch warning.
Link: https://lists.freedesktop.org/archives/amd-gfx/2022-June/079905.html
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
Cc: Dan Carpenter <dan.carpenter@oracle.com >
2022-06-06 14:43:28 -04:00