Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm amdgpu: SI UVD add firmwares

For implement UVD on SI asic, add Oland, Pitcairn, Verde, Tahiti firmwares.

Signed-off-by: Sonny Jiang <sonny.jiang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Sonny Jiang and committed by
Alex Deucher
d1af7ac2 9c39d77c

+26
+26
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
··· 54 54 #define FW_1_66_16 ((1 << 24) | (66 << 16) | (16 << 8)) 55 55 56 56 /* Firmware Names */ 57 + #ifdef CONFIG_DRM_AMDGPU_SI 58 + #define FIRMWARE_TAHITI "amdgpu/tahiti_uvd.bin" 59 + #define FIRMWARE_VERDE "amdgpu/verde_uvd.bin" 60 + #define FIRMWARE_PITCAIRN "amdgpu/pitcairn_uvd.bin" 61 + #define FIRMWARE_OLAND "amdgpu/oland_uvd.bin" 62 + #endif 57 63 #ifdef CONFIG_DRM_AMDGPU_CIK 58 64 #define FIRMWARE_BONAIRE "amdgpu/bonaire_uvd.bin" 59 65 #define FIRMWARE_KABINI "amdgpu/kabini_uvd.bin" ··· 106 100 unsigned *buf_sizes; 107 101 }; 108 102 103 + #ifdef CONFIG_DRM_AMDGPU_SI 104 + MODULE_FIRMWARE(FIRMWARE_TAHITI); 105 + MODULE_FIRMWARE(FIRMWARE_VERDE); 106 + MODULE_FIRMWARE(FIRMWARE_PITCAIRN); 107 + MODULE_FIRMWARE(FIRMWARE_OLAND); 108 + #endif 109 109 #ifdef CONFIG_DRM_AMDGPU_CIK 110 110 MODULE_FIRMWARE(FIRMWARE_BONAIRE); 111 111 MODULE_FIRMWARE(FIRMWARE_KABINI); ··· 145 133 INIT_DELAYED_WORK(&adev->uvd.idle_work, amdgpu_uvd_idle_work_handler); 146 134 147 135 switch (adev->asic_type) { 136 + #ifdef CONFIG_DRM_AMDGPU_SI 137 + case CHIP_TAHITI: 138 + fw_name = FIRMWARE_TAHITI; 139 + break; 140 + case CHIP_VERDE: 141 + fw_name = FIRMWARE_VERDE; 142 + break; 143 + case CHIP_PITCAIRN: 144 + fw_name = FIRMWARE_PITCAIRN; 145 + break; 146 + case CHIP_OLAND: 147 + fw_name = FIRMWARE_OLAND; 148 + break; 149 + #endif 148 150 #ifdef CONFIG_DRM_AMDGPU_CIK 149 151 case CHIP_BONAIRE: 150 152 fw_name = FIRMWARE_BONAIRE;