| From f07437be4b1d731a700bc51f70fb78ecd6e2d9b7 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 28 Jun 2020 19:12:42 +0800 |
| Subject: drm/amd/powerplay: fix compile error with ARCH=arc |
| |
| From: Evan Quan <evan.quan@amd.com> |
| |
| [ 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 | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c |
| index 655ba4fb05dcd..48af305d42d54 100644 |
| --- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c |
| +++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c |
| @@ -159,7 +159,8 @@ 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); |
| -- |
| 2.25.1 |
| |