From: Xiaojie Yuan Date: Tue, 11 Jun 2019 03:16:38 +0000 (+0800) Subject: drm/amdgpu/gfx10: declare cp/rlc firmwares for navi12 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=92c123aec1a28439c31a38500f35fef391b5953b;p=linux.git drm/amdgpu/gfx10: declare cp/rlc firmwares for navi12 Set the name properly to load the right ucode. Signed-off-by: Xiaojie Yuan Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c index 9dd12f692b33a..94bae62911fc2 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c @@ -77,6 +77,13 @@ MODULE_FIRMWARE("amdgpu/navi14_mec.bin"); MODULE_FIRMWARE("amdgpu/navi14_mec2.bin"); MODULE_FIRMWARE("amdgpu/navi14_rlc.bin"); +MODULE_FIRMWARE("amdgpu/navi12_ce.bin"); +MODULE_FIRMWARE("amdgpu/navi12_pfp.bin"); +MODULE_FIRMWARE("amdgpu/navi12_me.bin"); +MODULE_FIRMWARE("amdgpu/navi12_mec.bin"); +MODULE_FIRMWARE("amdgpu/navi12_mec2.bin"); +MODULE_FIRMWARE("amdgpu/navi12_rlc.bin"); + static const struct soc15_reg_golden golden_settings_gc_10_1[] = { SOC15_REG_GOLDEN_VALUE(GC, 0, mmCB_HW_CONTROL_4, 0xffffffff, 0x00400014), @@ -550,6 +557,9 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev) case CHIP_NAVI14: chip_name = "navi14"; break; + case CHIP_NAVI12: + chip_name = "navi12"; + break; default: BUG(); }