[PATCH] drm/amdgpu/psp11: check if prior to navi10 for sram map

[Deucher, Alexander]

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
________________________________
From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> on behalf of Yuan, Xiaojie <Xiaojie.Yuan at amd.com>
Sent: Tuesday, July 16, 2019 11:55 AM
To: amd-gfx at lists.freedesktop.org
Cc: tao1.zhou at amd.com; Xiao, Jack; Yuan, Xiaojie; Zhang, Hawking
Subject: [PATCH] drm/amdgpu/psp11: check if prior to navi10 for sram map

Signed-off-by: Xiaojie Yuan <xiaojie.yuan at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
index 87596c69b235..a8b526dbb6c6 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
@@ -538,7 +538,7 @@ psp_v11_0_sram_map(struct amdgpu_device *adev,

         case AMDGPU_UCODE_ID_RLC_G:
                 *sram_offset = 0x2000;
-               if (adev->asic_type != CHIP_NAVI10) {
+               if (adev->asic_type < CHIP_NAVI10) {
                         *sram_addr_reg_offset = SOC15_REG_OFFSET(GC, 0, mmRLC_GPM_UCODE_ADDR);
                         *sram_data_reg_offset = SOC15_REG_OFFSET(GC, 0, mmRLC_GPM_UCODE_DATA);
                 }
@@ -550,7 +550,7 @@ psp_v11_0_sram_map(struct amdgpu_device *adev,

         case AMDGPU_UCODE_ID_SDMA0:
                 *sram_offset = 0x0;
-               if (adev->asic_type != CHIP_NAVI10) {
+               if (adev->asic_type < CHIP_NAVI10) {
                         *sram_addr_reg_offset = SOC15_REG_OFFSET(SDMA0, 0, mmSDMA0_UCODE_ADDR);
                         *sram_data_reg_offset = SOC15_REG_OFFSET(SDMA0, 0, mmSDMA0_UCODE_DATA);
                 }
--
2.20.1

_______________________________________________
amd-gfx mailing list
amd-gfx at lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20190716/179708a2/attachment-0001.html>