diff options
author | Feifei Xu <Feifei.Xu@amd.com> | 2018-06-15 17:01:41 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-09-14 10:36:15 -0400 |
commit | 8b47cc9bb122e4bb970685b870484d9f31844ef0 (patch) | |
tree | 7f7fb70a200f2d0c52abb7c3779d36ab7bdceee7 /drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | |
parent | 54c4d17e98db7a7fae85a324b7ace134b3e3f8b5 (diff) |
drm/amdgpu: add raven2 vcn firmware support
Specify raven2 vcn firmware on amdgpu_vce_sw_init.
Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c index 93ffba2cbec4..a74498ce87ff 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | |||
@@ -43,9 +43,11 @@ | |||
43 | /* Firmware Names */ | 43 | /* Firmware Names */ |
44 | #define FIRMWARE_RAVEN "amdgpu/raven_vcn.bin" | 44 | #define FIRMWARE_RAVEN "amdgpu/raven_vcn.bin" |
45 | #define FIRMWARE_PICASSO "amdgpu/picasso_vcn.bin" | 45 | #define FIRMWARE_PICASSO "amdgpu/picasso_vcn.bin" |
46 | #define FIRMWARE_RAVEN2 "amdgpu/raven2_vcn.bin" | ||
46 | 47 | ||
47 | MODULE_FIRMWARE(FIRMWARE_RAVEN); | 48 | MODULE_FIRMWARE(FIRMWARE_RAVEN); |
48 | MODULE_FIRMWARE(FIRMWARE_PICASSO); | 49 | MODULE_FIRMWARE(FIRMWARE_PICASSO); |
50 | MODULE_FIRMWARE(FIRMWARE_RAVEN2); | ||
49 | 51 | ||
50 | static void amdgpu_vcn_idle_work_handler(struct work_struct *work); | 52 | static void amdgpu_vcn_idle_work_handler(struct work_struct *work); |
51 | 53 | ||
@@ -61,7 +63,10 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) | |||
61 | 63 | ||
62 | switch (adev->asic_type) { | 64 | switch (adev->asic_type) { |
63 | case CHIP_RAVEN: | 65 | case CHIP_RAVEN: |
64 | fw_name = FIRMWARE_RAVEN; | 66 | if (adev->rev_id >= 8) |
67 | fw_name = FIRMWARE_RAVEN2; | ||
68 | else | ||
69 | fw_name = FIRMWARE_RAVEN; | ||
65 | break; | 70 | break; |
66 | case CHIP_PICASSO: | 71 | case CHIP_PICASSO: |
67 | fw_name = FIRMWARE_PICASSO; | 72 | fw_name = FIRMWARE_PICASSO; |