diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2018-07-02 15:32:28 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2018-07-05 17:39:58 -0400 |
| commit | ce206464e3c7a0936468f0190599d2e6070850f4 (patch) | |
| tree | 1dd3fd8d51f7fb9ea7564d208949d9f40e825032 /drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | |
| parent | 9fc15f5fc836712b173f04e143b8d77fdded1a37 (diff) | |
drm/amdgpu: switch firmware path for CIK parts (v2)
Use separate firmware path for amdgpu to avoid conflicts
with radeon on CIK parts.
v2: squash in logic simplification (Alex)
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c index e950730f1933..693ec5ea4950 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | |||
| @@ -314,17 +314,17 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, | |||
| 314 | (adev->pdev->revision == 0x81) || | 314 | (adev->pdev->revision == 0x81) || |
| 315 | (adev->pdev->device == 0x665f)) { | 315 | (adev->pdev->device == 0x665f)) { |
| 316 | info->is_kicker = true; | 316 | info->is_kicker = true; |
| 317 | strcpy(fw_name, "radeon/bonaire_k_smc.bin"); | 317 | strcpy(fw_name, "amdgpu/bonaire_k_smc.bin"); |
| 318 | } else { | 318 | } else { |
| 319 | strcpy(fw_name, "radeon/bonaire_smc.bin"); | 319 | strcpy(fw_name, "amdgpu/bonaire_smc.bin"); |
| 320 | } | 320 | } |
| 321 | break; | 321 | break; |
| 322 | case CHIP_HAWAII: | 322 | case CHIP_HAWAII: |
| 323 | if (adev->pdev->revision == 0x80) { | 323 | if (adev->pdev->revision == 0x80) { |
| 324 | info->is_kicker = true; | 324 | info->is_kicker = true; |
| 325 | strcpy(fw_name, "radeon/hawaii_k_smc.bin"); | 325 | strcpy(fw_name, "amdgpu/hawaii_k_smc.bin"); |
| 326 | } else { | 326 | } else { |
| 327 | strcpy(fw_name, "radeon/hawaii_smc.bin"); | 327 | strcpy(fw_name, "amdgpu/hawaii_smc.bin"); |
| 328 | } | 328 | } |
| 329 | break; | 329 | break; |
| 330 | case CHIP_TOPAZ: | 330 | case CHIP_TOPAZ: |