Skip to content

Commit 25f602f

Browse files
Flora Cuialexdeucher
authored andcommitted
drm/amdgpu/discovery: use specific ip_discovery.bin for legacy asics
vega10/vega12/vega20/raven/raven2/picasso/arcturus/aldebaran Signed-off-by: Flora Cui <flora.cui@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 017fbb6 commit 25f602f

File tree

1 file changed

+27
-1
lines changed

1 file changed

+27
-1
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,12 @@
114114
#endif
115115

116116
MODULE_FIRMWARE("amdgpu/ip_discovery.bin");
117+
MODULE_FIRMWARE("amdgpu/vega10_ip_discovery.bin");
118+
MODULE_FIRMWARE("amdgpu/vega12_ip_discovery.bin");
119+
MODULE_FIRMWARE("amdgpu/vega20_ip_discovery.bin");
120+
MODULE_FIRMWARE("amdgpu/raven_ip_discovery.bin");
121+
MODULE_FIRMWARE("amdgpu/raven2_ip_discovery.bin");
122+
MODULE_FIRMWARE("amdgpu/picasso_ip_discovery.bin");
117123

118124
#define mmIP_DISCOVERY_VERSION 0x16A00
119125
#define mmRCC_CONFIG_MEMSIZE 0xde3
@@ -400,7 +406,27 @@ static const char *amdgpu_discovery_get_fw_name(struct amdgpu_device *adev)
400406
if (amdgpu_discovery == 2)
401407
return "amdgpu/ip_discovery.bin";
402408

403-
return NULL;
409+
switch (adev->asic_type) {
410+
case CHIP_VEGA10:
411+
return "amdgpu/vega10_ip_discovery.bin";
412+
case CHIP_VEGA12:
413+
return "amdgpu/vega12_ip_discovery.bin";
414+
case CHIP_RAVEN:
415+
if (adev->apu_flags & AMD_APU_IS_RAVEN2)
416+
return "amdgpu/raven2_ip_discovery.bin";
417+
else if (adev->apu_flags & AMD_APU_IS_PICASSO)
418+
return "amdgpu/picasso_ip_discovery.bin";
419+
else
420+
return "amdgpu/raven_ip_discovery.bin";
421+
case CHIP_VEGA20:
422+
return "amdgpu/vega20_ip_discovery.bin";
423+
case CHIP_ARCTURUS:
424+
return "amdgpu/arcturus_ip_discovery.bin";
425+
case CHIP_ALDEBARAN:
426+
return "amdgpu/aldebaran_ip_discovery.bin";
427+
default:
428+
return NULL;
429+
}
404430
}
405431

406432
static int amdgpu_discovery_init(struct amdgpu_device *adev)

0 commit comments

Comments
 (0)