drm/amdgpu: workaround the TMR MC address issue (v2)

Browse source

With the 2-level gart page table,  vram is squeezed into gart aperture
and FB aperture is disabled. Therefore all VRAM virtual addresses are
 in the GART aperture. However currently PSP requires TMR addresses
in FB aperture. So we need some design change at PSP FW level to support
this 2-level gart table driver change. Right now this PSP FW support
doesn't exist. To workaround this issue temporarily, FB aperture is
added back and the gart aperture address is converted back to FB aperture
for this PSP TMR address.

Will revert it after we get a fix from PSP FW.

v2: squash in tmr fix for other asics (Kevin)

Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
Reviewed-by: Felix Kuehling <felix.kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

...

This commit is contained in:

Oak Zeng 2021-01-26 13:51:36 -06:00 • committed by Alex Deucher

parent 0c19cab555

commit 2f055097da

4 changed files with 40 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

9

drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h

View file

10

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

View file

21

drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c

View file

10

drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c

View file