Commit 8b47cc9b authored by Feifei Xu's avatar Feifei Xu Committed by Alex Deucher

drm/amdgpu: add raven2 vcn firmware support

Specify raven2 vcn firmware on amdgpu_vce_sw_init.
Signed-off-by: default avatarFeifei Xu <Feifei.Xu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 54c4d17e
...@@ -43,9 +43,11 @@ ...@@ -43,9 +43,11 @@
/* Firmware Names */ /* Firmware Names */
#define FIRMWARE_RAVEN "amdgpu/raven_vcn.bin" #define FIRMWARE_RAVEN "amdgpu/raven_vcn.bin"
#define FIRMWARE_PICASSO "amdgpu/picasso_vcn.bin" #define FIRMWARE_PICASSO "amdgpu/picasso_vcn.bin"
#define FIRMWARE_RAVEN2 "amdgpu/raven2_vcn.bin"
MODULE_FIRMWARE(FIRMWARE_RAVEN); MODULE_FIRMWARE(FIRMWARE_RAVEN);
MODULE_FIRMWARE(FIRMWARE_PICASSO); MODULE_FIRMWARE(FIRMWARE_PICASSO);
MODULE_FIRMWARE(FIRMWARE_RAVEN2);
static void amdgpu_vcn_idle_work_handler(struct work_struct *work); static void amdgpu_vcn_idle_work_handler(struct work_struct *work);
...@@ -61,7 +63,10 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) ...@@ -61,7 +63,10 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)
switch (adev->asic_type) { switch (adev->asic_type) {
case CHIP_RAVEN: case CHIP_RAVEN:
fw_name = FIRMWARE_RAVEN; if (adev->rev_id >= 8)
fw_name = FIRMWARE_RAVEN2;
else
fw_name = FIRMWARE_RAVEN;
break; break;
case CHIP_PICASSO: case CHIP_PICASSO:
fw_name = FIRMWARE_PICASSO; fw_name = FIRMWARE_PICASSO;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment