diff options
| author | Oak Zeng <[email protected]> | 2021-03-11 17:17:51 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2021-04-21 01:43:49 +0000 |
| commit | 5f41741a6d46b55f187e4314b767bb15e7e263d0 (patch) | |
| tree | f808b82beb20fbd62f043e5764101eebbc910380 /drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | |
| parent | drm/amd/display: 3.2.132 (diff) | |
| download | kernel-5f41741a6d46b55f187e4314b767bb15e7e263d0.tar.gz kernel-5f41741a6d46b55f187e4314b767bb15e7e263d0.zip | |
Revert "drm/amdgpu: workaround the TMR MC address issue (v2)"
This reverts commit 2f055097daef498da57552f422f49de50a1573e6.
2f055097daef498da57552f422f49de50a1573e6 was a driver workaround
when PSP firmware was not ready. Now the PSP fw is ready so we
revert this driver workaround.
Signed-off-by: Oak Zeng <[email protected]>
Reviewed-by: Harish Kasiviswanathan <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index 7bdf93716fbf..a09483beb968 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -414,16 +414,6 @@ static int psp_tmr_init(struct psp_context *psp) AMDGPU_GEM_DOMAIN_VRAM, &psp->tmr_bo, &psp->tmr_mc_addr, pptr); - /* workaround the tmr_mc_addr: - * PSP requires an address in FB aperture. Right now driver produce - * tmr_mc_addr in the GART aperture. Convert it back to FB aperture - * for PSP. Will revert it after we get a fix from PSP FW. - */ - if (psp->adev->asic_type == CHIP_ALDEBARAN) { - psp->tmr_mc_addr -= psp->adev->gmc.fb_start; - psp->tmr_mc_addr += psp->adev->gmc.fb_start_original; - } - return ret; } |