Skip to content

Commit e402519

Browse files
Timur Kristófalexdeucher
authored andcommitted
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>
1 parent 1b8ed11 commit e402519

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@
4141
#define VCE_IDLE_TIMEOUT msecs_to_jiffies(1000)
4242

4343
/* Firmware Names */
44+
#ifdef CONFIG_DRM_AMDGPU_SI
45+
#define FIRMWARE_VCE_V1_0 "amdgpu/vce_1_0_0.bin"
46+
#endif
4447
#ifdef CONFIG_DRM_AMDGPU_CIK
4548
#define FIRMWARE_BONAIRE "amdgpu/bonaire_vce.bin"
4649
#define FIRMWARE_KABINI "amdgpu/kabini_vce.bin"
@@ -61,6 +64,9 @@
6164
#define FIRMWARE_VEGA12 "amdgpu/vega12_vce.bin"
6265
#define FIRMWARE_VEGA20 "amdgpu/vega20_vce.bin"
6366

67+
#ifdef CONFIG_DRM_AMDGPU_SI
68+
MODULE_FIRMWARE(FIRMWARE_VCE_V1_0);
69+
#endif
6470
#ifdef CONFIG_DRM_AMDGPU_CIK
6571
MODULE_FIRMWARE(FIRMWARE_BONAIRE);
6672
MODULE_FIRMWARE(FIRMWARE_KABINI);
@@ -99,6 +105,12 @@ static int amdgpu_vce_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle,
99105
static const char *amdgpu_vce_firmware_name(struct amdgpu_device *adev)
100106
{
101107
switch (adev->asic_type) {
108+
#ifdef CONFIG_DRM_AMDGPU_SI
109+
case CHIP_PITCAIRN:
110+
case CHIP_TAHITI:
111+
case CHIP_VERDE:
112+
return FIRMWARE_VCE_V1_0;
113+
#endif
102114
#ifdef CONFIG_DRM_AMDGPU_CIK
103115
case CHIP_BONAIRE:
104116
return FIRMWARE_BONAIRE;

0 commit comments

Comments
 (0)