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

drm/amdgpu: add VCE support for Stoney (v2)

Stoney is VCE 3.x single.

v2: Stoney is single pipe like Fiji

Signed-off-by: Samuel Li <samuel.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Samuel Li and committed by
Alex Deucher
cfaba566 a39c8cea

+8 -2
+5
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
··· 49 49 #define FIRMWARE_TONGA "amdgpu/tonga_vce.bin" 50 50 #define FIRMWARE_CARRIZO "amdgpu/carrizo_vce.bin" 51 51 #define FIRMWARE_FIJI "amdgpu/fiji_vce.bin" 52 + #define FIRMWARE_STONEY "amdgpu/stoney_vce.bin" 52 53 53 54 #ifdef CONFIG_DRM_AMDGPU_CIK 54 55 MODULE_FIRMWARE(FIRMWARE_BONAIRE); ··· 61 60 MODULE_FIRMWARE(FIRMWARE_TONGA); 62 61 MODULE_FIRMWARE(FIRMWARE_CARRIZO); 63 62 MODULE_FIRMWARE(FIRMWARE_FIJI); 63 + MODULE_FIRMWARE(FIRMWARE_STONEY); 64 64 65 65 static void amdgpu_vce_idle_work_handler(struct work_struct *work); 66 66 ··· 107 105 break; 108 106 case CHIP_FIJI: 109 107 fw_name = FIRMWARE_FIJI; 108 + break; 109 + case CHIP_STONEY: 110 + fw_name = FIRMWARE_STONEY; 110 111 break; 111 112 112 113 default:
+3 -2
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
··· 205 205 u32 tmp; 206 206 unsigned ret; 207 207 208 - /* Fiji is single pipe */ 209 - if (adev->asic_type == CHIP_FIJI) { 208 + /* Fiji, Stoney are single pipe */ 209 + if ((adev->asic_type == CHIP_FIJI) || 210 + (adev->asic_type == CHIP_STONEY)){ 210 211 ret = AMDGPU_VCE_HARVEST_VCE1; 211 212 return ret; 212 213 }