diff options
author | Hawking Zhang <Hawking.Zhang@amd.com> | 2019-07-17 05:52:28 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2019-07-31 15:48:51 -0400 |
commit | 6501a771708d7fa66bc87b13efcc8ab837f1e2ed (patch) | |
tree | 9fbba38f6878d0d560756cc07aef467cdfbd7124 | |
parent | 7af25d5b7ea70a7ac669a61c5d9317b2be27c2b9 (diff) |
drm/amdgpu: init RSMU and UMC ip base address for vega20
the driver needs to program RSMU and UMC registers to
support vega20 RAS feature
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Dennis Li <dennis.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index c87dfdb8aedb..de2853b281f7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -752,6 +752,8 @@ enum amd_hw_ip_block_type { | |||
752 | NBIF_HWIP, | 752 | NBIF_HWIP, |
753 | THM_HWIP, | 753 | THM_HWIP, |
754 | CLK_HWIP, | 754 | CLK_HWIP, |
755 | UMC_HWIP, | ||
756 | RSMU_HWIP, | ||
755 | MAX_HWIP | 757 | MAX_HWIP |
756 | }; | 758 | }; |
757 | 759 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c b/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c index 79223188bd47..587e33f5dcce 100644 --- a/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c +++ b/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | |||
@@ -50,6 +50,8 @@ int vega20_reg_base_init(struct amdgpu_device *adev) | |||
50 | adev->reg_offset[NBIF_HWIP][i] = (uint32_t *)(&(NBIO_BASE.instance[i])); | 50 | adev->reg_offset[NBIF_HWIP][i] = (uint32_t *)(&(NBIO_BASE.instance[i])); |
51 | adev->reg_offset[THM_HWIP][i] = (uint32_t *)(&(THM_BASE.instance[i])); | 51 | adev->reg_offset[THM_HWIP][i] = (uint32_t *)(&(THM_BASE.instance[i])); |
52 | adev->reg_offset[CLK_HWIP][i] = (uint32_t *)(&(CLK_BASE.instance[i])); | 52 | adev->reg_offset[CLK_HWIP][i] = (uint32_t *)(&(CLK_BASE.instance[i])); |
53 | adev->reg_offset[UMC_HWIP][i] = (uint32_t *)(&(UMC_BASE.instance[i])); | ||
54 | adev->reg_offset[RSMU_HWIP][i] = (uint32_t *)(&(RSMU_BASE.instance[i])); | ||
53 | } | 55 | } |
54 | return 0; | 56 | return 0; |
55 | } | 57 | } |