Skip to content

Commit d83d3ad

Browse files
thaithongalexdeucher
authored andcommitted
drm/amdgpu: enable vcn support for green_sardine (v2)
Enable Green_Sardine VCN support and VCN firmware loading v2: use apu flags Signed-off-by: Thong Thai <thong.thai@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 6869798 commit d83d3ad

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#define FIRMWARE_RAVEN2 "amdgpu/raven2_vcn.bin"
4040
#define FIRMWARE_ARCTURUS "amdgpu/arcturus_vcn.bin"
4141
#define FIRMWARE_RENOIR "amdgpu/renoir_vcn.bin"
42+
#define FIRMWARE_GREEN_SARDINE "amdgpu/green_sardine_vcn.bin"
4243
#define FIRMWARE_NAVI10 "amdgpu/navi10_vcn.bin"
4344
#define FIRMWARE_NAVI14 "amdgpu/navi14_vcn.bin"
4445
#define FIRMWARE_NAVI12 "amdgpu/navi12_vcn.bin"
@@ -50,6 +51,7 @@ MODULE_FIRMWARE(FIRMWARE_PICASSO);
5051
MODULE_FIRMWARE(FIRMWARE_RAVEN2);
5152
MODULE_FIRMWARE(FIRMWARE_ARCTURUS);
5253
MODULE_FIRMWARE(FIRMWARE_RENOIR);
54+
MODULE_FIRMWARE(FIRMWARE_GREEN_SARDINE);
5355
MODULE_FIRMWARE(FIRMWARE_NAVI10);
5456
MODULE_FIRMWARE(FIRMWARE_NAVI14);
5557
MODULE_FIRMWARE(FIRMWARE_NAVI12);
@@ -89,7 +91,11 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)
8991
adev->vcn.indirect_sram = true;
9092
break;
9193
case CHIP_RENOIR:
92-
fw_name = FIRMWARE_RENOIR;
94+
if (adev->apu_flags & AMD_APU_IS_RENOIR)
95+
fw_name = FIRMWARE_RENOIR;
96+
else
97+
fw_name = FIRMWARE_GREEN_SARDINE;
98+
9399
if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&
94100
(adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))
95101
adev->vcn.indirect_sram = true;

0 commit comments

Comments
 (0)