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

Switch over to handling in the powerplay module.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index 8f758ea..a611401 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -703,6 +703,9 @@ static int amdgpu_cgs_get_firmware_info(void *cgs_device,
                case CHIP_TONGA:
                        strcpy(fw_name, "amdgpu/tonga_smc.bin");
                        break;
+               case CHIP_FIJI:
+                       strcpy(fw_name, "amdgpu/fiji_smc.bin");
+                       break;
                default:
                        DRM_ERROR("SMC firmware not supported\n");
                        return -EINVAL;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
index 5dd2a4c..1a824f0 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
@@ -77,6 +77,9 @@ static int amdgpu_powerplay_init(struct amdgpu_device *adev)
                case CHIP_TONGA:
                        amd_pp->ip_funcs = &tonga_dpm_ip_funcs;
                        break;
+               case CHIP_FIJI:
+                       amd_pp->ip_funcs = &fiji_dpm_ip_funcs;
+                       break;
                case CHIP_CARRIZO:
                        amd_pp->ip_funcs = &cz_dpm_ip_funcs;
                        break;

diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index 8e4c026..e51070e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -1246,7 +1246,7 @@ static const struct amdgpu_ip_block_version fiji_ip_blocks[] =
                .major = 7,
                .minor = 1,
                .rev = 0,
-               .funcs = &fiji_dpm_ip_funcs,
+               .funcs = &amdgpu_pp_ip_funcs,
        },
        {
                .type = AMD_IP_BLOCK_TYPE_DCE,