Commit 899fa4c0 authored by Eric Huang's avatar Eric Huang Committed by Alex Deucher

drm/amd/amdgpu: enable powerplay and smc firmware loading for Fiji.

Switch over to handling in the powerplay module.
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarEric Huang <JinHuiEric.Huang@amd.com>
parent 3a74f6f2
...@@ -703,6 +703,9 @@ static int amdgpu_cgs_get_firmware_info(void *cgs_device, ...@@ -703,6 +703,9 @@ static int amdgpu_cgs_get_firmware_info(void *cgs_device,
case CHIP_TONGA: case CHIP_TONGA:
strcpy(fw_name, "amdgpu/tonga_smc.bin"); strcpy(fw_name, "amdgpu/tonga_smc.bin");
break; break;
case CHIP_FIJI:
strcpy(fw_name, "amdgpu/fiji_smc.bin");
break;
default: default:
DRM_ERROR("SMC firmware not supported\n"); DRM_ERROR("SMC firmware not supported\n");
return -EINVAL; return -EINVAL;
......
...@@ -77,6 +77,9 @@ static int amdgpu_powerplay_init(struct amdgpu_device *adev) ...@@ -77,6 +77,9 @@ static int amdgpu_powerplay_init(struct amdgpu_device *adev)
case CHIP_TONGA: case CHIP_TONGA:
amd_pp->ip_funcs = &tonga_dpm_ip_funcs; amd_pp->ip_funcs = &tonga_dpm_ip_funcs;
break; break;
case CHIP_FIJI:
amd_pp->ip_funcs = &fiji_dpm_ip_funcs;
break;
case CHIP_CARRIZO: case CHIP_CARRIZO:
amd_pp->ip_funcs = &cz_dpm_ip_funcs; amd_pp->ip_funcs = &cz_dpm_ip_funcs;
break; break;
......
...@@ -1246,7 +1246,7 @@ static const struct amdgpu_ip_block_version fiji_ip_blocks[] = ...@@ -1246,7 +1246,7 @@ static const struct amdgpu_ip_block_version fiji_ip_blocks[] =
.major = 7, .major = 7,
.minor = 1, .minor = 1,
.rev = 0, .rev = 0,
.funcs = &fiji_dpm_ip_funcs, .funcs = &amdgpu_pp_ip_funcs,
}, },
{ {
.type = AMD_IP_BLOCK_TYPE_DCE, .type = AMD_IP_BLOCK_TYPE_DCE,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment