Merge airlied/drm-next into drm-misc-next

Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 35 insertions, 10 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index a5df1ef306d9..d9e5aa4a79ef 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -834,32 +834,57 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
                         case CHIP_TOPAZ:
                                 if (((adev->pdev->device == 0x6900) && (adev->pdev->revision == 0x81)) ||
                                     ((adev->pdev->device == 0x6900) && (adev->pdev->revision == 0x83)) ||
-                                    ((adev->pdev->device == 0x6907) && (adev->pdev->revision == 0x87)))
+                                    ((adev->pdev->device == 0x6907) && (adev->pdev->revision == 0x87))) {
+                                        info->is_kicker = true;
                                         strcpy(fw_name, "amdgpu/topaz_k_smc.bin");
-                                else
+                                } else
                                         strcpy(fw_name, "amdgpu/topaz_smc.bin");
                                 break;
                         case CHIP_TONGA:
                                 if (((adev->pdev->device == 0x6939) && (adev->pdev->revision == 0xf1)) ||
-                                    ((adev->pdev->device == 0x6938) && (adev->pdev->revision == 0xf1)))
+                                    ((adev->pdev->device == 0x6938) && (adev->pdev->revision == 0xf1))) {
+                                        info->is_kicker = true;
                                         strcpy(fw_name, "amdgpu/tonga_k_smc.bin");
-                                else
+                                } else
                                         strcpy(fw_name, "amdgpu/tonga_smc.bin");
                                 break;
                         case CHIP_FIJI:
                                 strcpy(fw_name, "amdgpu/fiji_smc.bin");
                                 break;
                         case CHIP_POLARIS11:
-                                if (type == CGS_UCODE_ID_SMU)
-                                        strcpy(fw_name, "amdgpu/polaris11_smc.bin");
-                                else if (type == CGS_UCODE_ID_SMU_SK)
+                                if (type == CGS_UCODE_ID_SMU) {
+                                        if (((adev->pdev->device == 0x67ef) &&
+                                             ((adev->pdev->revision == 0xe0) ||
+                                              (adev->pdev->revision == 0xe2) ||
+                                              (adev->pdev->revision == 0xe5))) ||
+                                            ((adev->pdev->device == 0x67ff) &&
+                                             ((adev->pdev->revision == 0xcf) ||
+                                              (adev->pdev->revision == 0xef) ||
+                                              (adev->pdev->revision == 0xff)))) {
+                                                info->is_kicker = true;
+                                                strcpy(fw_name, "amdgpu/polaris11_k_smc.bin");
+                                        } else
+                                                strcpy(fw_name, "amdgpu/polaris11_smc.bin");
+                                } else if (type == CGS_UCODE_ID_SMU_SK) {
                                         strcpy(fw_name, "amdgpu/polaris11_smc_sk.bin");
+                                }
                                 break;
                         case CHIP_POLARIS10:
-                                if (type == CGS_UCODE_ID_SMU)
-                                        strcpy(fw_name, "amdgpu/polaris10_smc.bin");
-                                else if (type == CGS_UCODE_ID_SMU_SK)
+                                if (type == CGS_UCODE_ID_SMU) {
+                                        if ((adev->pdev->device == 0x67df) &&
+                                            ((adev->pdev->revision == 0xe0) ||
+                                             (adev->pdev->revision == 0xe3) ||
+                                             (adev->pdev->revision == 0xe4) ||
+                                             (adev->pdev->revision == 0xe5) ||
+                                             (adev->pdev->revision == 0xe7) ||
+                                             (adev->pdev->revision == 0xef))) {
+                                                info->is_kicker = true;
+                                                strcpy(fw_name, "amdgpu/polaris10_k_smc.bin");
+                                        } else
+                                                strcpy(fw_name, "amdgpu/polaris10_smc.bin");
+                                } else if (type == CGS_UCODE_ID_SMU_SK) {
                                         strcpy(fw_name, "amdgpu/polaris10_smc_sk.bin");
+                                }
                                 break;
                         case CHIP_POLARIS12:
                                 strcpy(fw_name, "amdgpu/polaris12_smc.bin");