diff options
author | Evan Quan <evan.quan@amd.com> | 2018-04-10 00:30:59 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-05-15 14:43:04 -0400 |
commit | e6636ae1b7aab30a1fb4ea7805b5b6b2494eca71 (patch) | |
tree | 2b37cb39befb5bafaa7c307c978775a840da0c03 /drivers/gpu/drm/amd/amdgpu | |
parent | f73f9e35a2a7c8cee3691a4b7313bbc3b95eec6b (diff) |
drm/amdgpu: add MP1 and THM hw ip base reg offset
Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 21272ce74b56..7e5defbfc3b9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -1391,6 +1391,7 @@ enum amd_hw_ip_block_type { | |||
1391 | ATHUB_HWIP, | 1391 | ATHUB_HWIP, |
1392 | NBIO_HWIP, | 1392 | NBIO_HWIP, |
1393 | MP0_HWIP, | 1393 | MP0_HWIP, |
1394 | MP1_HWIP, | ||
1394 | UVD_HWIP, | 1395 | UVD_HWIP, |
1395 | VCN_HWIP = UVD_HWIP, | 1396 | VCN_HWIP = UVD_HWIP, |
1396 | VCE_HWIP, | 1397 | VCE_HWIP, |
@@ -1400,6 +1401,7 @@ enum amd_hw_ip_block_type { | |||
1400 | SMUIO_HWIP, | 1401 | SMUIO_HWIP, |
1401 | PWR_HWIP, | 1402 | PWR_HWIP, |
1402 | NBIF_HWIP, | 1403 | NBIF_HWIP, |
1404 | THM_HWIP, | ||
1403 | MAX_HWIP | 1405 | MAX_HWIP |
1404 | }; | 1406 | }; |
1405 | 1407 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c b/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c index 4c45db7f1157..45aafca7f315 100644 --- a/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c +++ b/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | |||
@@ -38,6 +38,7 @@ int vega10_reg_base_init(struct amdgpu_device *adev) | |||
38 | adev->reg_offset[ATHUB_HWIP][i] = (uint32_t *)(&(ATHUB_BASE.instance[i])); | 38 | adev->reg_offset[ATHUB_HWIP][i] = (uint32_t *)(&(ATHUB_BASE.instance[i])); |
39 | adev->reg_offset[NBIO_HWIP][i] = (uint32_t *)(&(NBIO_BASE.instance[i])); | 39 | adev->reg_offset[NBIO_HWIP][i] = (uint32_t *)(&(NBIO_BASE.instance[i])); |
40 | adev->reg_offset[MP0_HWIP][i] = (uint32_t *)(&(MP0_BASE.instance[i])); | 40 | adev->reg_offset[MP0_HWIP][i] = (uint32_t *)(&(MP0_BASE.instance[i])); |
41 | adev->reg_offset[MP1_HWIP][i] = (uint32_t *)(&(MP1_BASE.instance[i])); | ||
41 | adev->reg_offset[UVD_HWIP][i] = (uint32_t *)(&(UVD_BASE.instance[i])); | 42 | adev->reg_offset[UVD_HWIP][i] = (uint32_t *)(&(UVD_BASE.instance[i])); |
42 | adev->reg_offset[VCE_HWIP][i] = (uint32_t *)(&(VCE_BASE.instance[i])); | 43 | adev->reg_offset[VCE_HWIP][i] = (uint32_t *)(&(VCE_BASE.instance[i])); |
43 | adev->reg_offset[VCN_HWIP][i] = (uint32_t *)(&(VCN_BASE.instance[i])); | 44 | adev->reg_offset[VCN_HWIP][i] = (uint32_t *)(&(VCN_BASE.instance[i])); |
@@ -49,7 +50,7 @@ int vega10_reg_base_init(struct amdgpu_device *adev) | |||
49 | adev->reg_offset[SMUIO_HWIP][i] = (uint32_t *)(&(SMUIO_BASE.instance[i])); | 50 | adev->reg_offset[SMUIO_HWIP][i] = (uint32_t *)(&(SMUIO_BASE.instance[i])); |
50 | adev->reg_offset[PWR_HWIP][i] = (uint32_t *)(&(PWR_BASE.instance[i])); | 51 | adev->reg_offset[PWR_HWIP][i] = (uint32_t *)(&(PWR_BASE.instance[i])); |
51 | adev->reg_offset[NBIF_HWIP][i] = (uint32_t *)(&(NBIF_BASE.instance[i])); | 52 | adev->reg_offset[NBIF_HWIP][i] = (uint32_t *)(&(NBIF_BASE.instance[i])); |
52 | 53 | adev->reg_offset[THM_HWIP][i] = (uint32_t *)(&(THM_BASE.instance[i])); | |
53 | } | 54 | } |
54 | return 0; | 55 | return 0; |
55 | } | 56 | } |