aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Rui <ray.huang@amd.com>2016-06-19 11:55:14 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-07-15 12:33:10 -0400
commit340efe2898f6ad5a74bbbbf8002f1196ecf1a1bf (patch)
treeb79ecd9d296d163983cda844205883a36cded2ef
parent86a42f04d1b38c1196b9a90e4851995c4bf35a4e (diff)
drm/amdgpu: add ucode_start_address into cgs_firmware_info
The ucode_start_address would be used on powerplay of iceland. Signed-off-by: Huang Rui <ray.huang@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c4
-rw-r--r--drivers/gpu/drm/amd/include/cgs_common.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index 5556ce979199..ee95e950a19b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -752,6 +752,9 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
752 752
753 if (!adev->pm.fw) { 753 if (!adev->pm.fw) {
754 switch (adev->asic_type) { 754 switch (adev->asic_type) {
755 case CHIP_TOPAZ:
756 strcpy(fw_name, "amdgpu/topaz_smc.bin");
757 break;
755 case CHIP_TONGA: 758 case CHIP_TONGA:
756 strcpy(fw_name, "amdgpu/tonga_smc.bin"); 759 strcpy(fw_name, "amdgpu/tonga_smc.bin");
757 break; 760 break;
@@ -800,6 +803,7 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
800 803
801 info->version = adev->pm.fw_version; 804 info->version = adev->pm.fw_version;
802 info->image_size = ucode_size; 805 info->image_size = ucode_size;
806 info->ucode_start_address = ucode_start_address;
803 info->kptr = (void *)src; 807 info->kptr = (void *)src;
804 } 808 }
805 return 0; 809 return 0;
diff --git a/drivers/gpu/drm/amd/include/cgs_common.h b/drivers/gpu/drm/amd/include/cgs_common.h
index 0c8c85d2a2a5..f32af2f2091a 100644
--- a/drivers/gpu/drm/amd/include/cgs_common.h
+++ b/drivers/gpu/drm/amd/include/cgs_common.h
@@ -160,6 +160,10 @@ struct cgs_firmware_info {
160 uint16_t feature_version; 160 uint16_t feature_version;
161 uint32_t image_size; 161 uint32_t image_size;
162 uint64_t mc_addr; 162 uint64_t mc_addr;
163
164 /* only for smc firmware */
165 uint32_t ucode_start_address;
166
163 void *kptr; 167 void *kptr;
164}; 168};
165 169