aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu <leo.liu@amd.com>2019-07-09 11:09:06 -0400
committerAlex Deucher <alexander.deucher@amd.com>2019-07-18 15:18:04 -0400
commita7c0e4019f7473055713fa011079dd19a8a16d5f (patch)
tree5e3b66dcc02ac110525083789aea3c09f12fc2c7
parentcbead2bdfcf1ddaa3e65de22a3f88034736a71fd (diff)
drm/amdgpu: add Arcturus to the VCN family
including firmware support etc. Signed-off-by: Leo Liu <leo.liu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index 3e1a360dee54..a119a7df0305 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -46,12 +46,14 @@
46#define FIRMWARE_RAVEN "amdgpu/raven_vcn.bin" 46#define FIRMWARE_RAVEN "amdgpu/raven_vcn.bin"
47#define FIRMWARE_PICASSO "amdgpu/picasso_vcn.bin" 47#define FIRMWARE_PICASSO "amdgpu/picasso_vcn.bin"
48#define FIRMWARE_RAVEN2 "amdgpu/raven2_vcn.bin" 48#define FIRMWARE_RAVEN2 "amdgpu/raven2_vcn.bin"
49#define FIRMWARE_ARCTURUS "amdgpu/arcturus_vcn.bin"
49#define FIRMWARE_NAVI10 "amdgpu/navi10_vcn.bin" 50#define FIRMWARE_NAVI10 "amdgpu/navi10_vcn.bin"
50#define FIRMWARE_NAVI14 "amdgpu/navi14_vcn.bin" 51#define FIRMWARE_NAVI14 "amdgpu/navi14_vcn.bin"
51 52
52MODULE_FIRMWARE(FIRMWARE_RAVEN); 53MODULE_FIRMWARE(FIRMWARE_RAVEN);
53MODULE_FIRMWARE(FIRMWARE_PICASSO); 54MODULE_FIRMWARE(FIRMWARE_PICASSO);
54MODULE_FIRMWARE(FIRMWARE_RAVEN2); 55MODULE_FIRMWARE(FIRMWARE_RAVEN2);
56MODULE_FIRMWARE(FIRMWARE_ARCTURUS);
55MODULE_FIRMWARE(FIRMWARE_NAVI10); 57MODULE_FIRMWARE(FIRMWARE_NAVI10);
56MODULE_FIRMWARE(FIRMWARE_NAVI14); 58MODULE_FIRMWARE(FIRMWARE_NAVI14);
57 59
@@ -76,6 +78,9 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)
76 else 78 else
77 fw_name = FIRMWARE_RAVEN; 79 fw_name = FIRMWARE_RAVEN;
78 break; 80 break;
81 case CHIP_ARCTURUS:
82 fw_name = FIRMWARE_ARCTURUS;
83 break;
79 case CHIP_NAVI10: 84 case CHIP_NAVI10:
80 fw_name = FIRMWARE_NAVI10; 85 fw_name = FIRMWARE_NAVI10;
81 if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) && 86 if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&