]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/amd/powerplay: fix compile error with ARCH=arc
authorEvan Quan <evan.quan@amd.com>
Sun, 28 Jun 2020 11:12:42 +0000 (19:12 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Aug 2020 06:16:03 +0000 (08:16 +0200)
[ Upstream commit 9822ba2ead1baa3de4860ad9472f652c4cc78c9c ]

Fix the compile error below:
drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c: In function 'smu_v11_0_init_microcode':
>> arch/arc/include/asm/bug.h:22:2: error: implicit declaration of function 'pr_warn'; did you mean 'pci_warn'? [-Werror=implicit-function-declaration]
      22 |  pr_warn("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \
         |  ^~~~~~~
drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c:176:3: note: in expansion of macro 'BUG'
     176 |   BUG();

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Evan Quan <evan.quan@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/amd/powerplay/smu_v11_0.c

index 0922d9cd858a01fc12cc44c92271c6fbac82fc0f..c4d8c52c6b9ca7c3f4c63228e2ebc19a01e9eeef 100644 (file)
@@ -171,7 +171,8 @@ static int smu_v11_0_init_microcode(struct smu_context *smu)
                chip_name = "navi12";
                break;
        default:
-               BUG();
+               dev_err(adev->dev, "Unsupported ASIC type %d\n", adev->asic_type);
+               return -EINVAL;
        }
 
        snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_smc.bin", chip_name);