mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
drm/amdgpu/vce1: Load VCE1 firmware
Load VCE1 firmware using amdgpu_ucode_request, just like it is done for other VCE versions. All SI chips share the same VCE1 firmware file: vce_1_0_0.bin which will be sent to linux-firmware soon. Signed-off-by: Timur Kristóf <timur.kristof@gmail.com> Co-developed-by: Alexandre Demers <alexandre.f.demers@gmail.com> Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
committed by
Alex Deucher
parent
1b8ed1168a
commit
e40251971c
@@ -41,6 +41,9 @@
|
||||
#define VCE_IDLE_TIMEOUT msecs_to_jiffies(1000)
|
||||
|
||||
/* Firmware Names */
|
||||
#ifdef CONFIG_DRM_AMDGPU_SI
|
||||
#define FIRMWARE_VCE_V1_0 "amdgpu/vce_1_0_0.bin"
|
||||
#endif
|
||||
#ifdef CONFIG_DRM_AMDGPU_CIK
|
||||
#define FIRMWARE_BONAIRE "amdgpu/bonaire_vce.bin"
|
||||
#define FIRMWARE_KABINI "amdgpu/kabini_vce.bin"
|
||||
@@ -61,6 +64,9 @@
|
||||
#define FIRMWARE_VEGA12 "amdgpu/vega12_vce.bin"
|
||||
#define FIRMWARE_VEGA20 "amdgpu/vega20_vce.bin"
|
||||
|
||||
#ifdef CONFIG_DRM_AMDGPU_SI
|
||||
MODULE_FIRMWARE(FIRMWARE_VCE_V1_0);
|
||||
#endif
|
||||
#ifdef CONFIG_DRM_AMDGPU_CIK
|
||||
MODULE_FIRMWARE(FIRMWARE_BONAIRE);
|
||||
MODULE_FIRMWARE(FIRMWARE_KABINI);
|
||||
@@ -99,6 +105,12 @@ static int amdgpu_vce_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle,
|
||||
static const char *amdgpu_vce_firmware_name(struct amdgpu_device *adev)
|
||||
{
|
||||
switch (adev->asic_type) {
|
||||
#ifdef CONFIG_DRM_AMDGPU_SI
|
||||
case CHIP_PITCAIRN:
|
||||
case CHIP_TAHITI:
|
||||
case CHIP_VERDE:
|
||||
return FIRMWARE_VCE_V1_0;
|
||||
#endif
|
||||
#ifdef CONFIG_DRM_AMDGPU_CIK
|
||||
case CHIP_BONAIRE:
|
||||
return FIRMWARE_BONAIRE;
|
||||
|
||||
Reference in New Issue
Block a user