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

drm/amdgpu: enable VCN2.5 on Arcturus

VCN is the video decode and encode engine on Arcturus

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>

authored by

Leo Liu and committed by
Alex Deucher
08249a3a 80010737

+31
+2
drivers/gpu/drm/amd/amdgpu/soc15.c
··· 63 63 #include "uvd_v7_0.h" 64 64 #include "vce_v4_0.h" 65 65 #include "vcn_v1_0.h" 66 + #include "vcn_v2_5.h" 66 67 #include "dce_virtual.h" 67 68 #include "mxgpu_ai.h" 68 69 #include "amdgpu_smu.h" ··· 685 684 amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block); 686 685 amdgpu_device_ip_block_add(adev, &gfx_v9_0_ip_block); 687 686 amdgpu_device_ip_block_add(adev, &sdma_v4_0_ip_block); 687 + amdgpu_device_ip_block_add(adev, &vcn_v2_5_ip_block); 688 688 break; 689 689 default: 690 690 return -EINVAL;
+29
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.h
··· 1 + /* 2 + * Copyright 2019 Advanced Micro Devices, Inc. 3 + * 4 + * Permission is hereby granted, free of charge, to any person obtaining a 5 + * copy of this software and associated documentation files (the "Software"), 6 + * to deal in the Software without restriction, including without limitation 7 + * the rights to use, copy, modify, merge, publish, distribute, sublicense, 8 + * and/or sell copies of the Software, and to permit persons to whom the 9 + * Software is furnished to do so, subject to the following conditions: 10 + * 11 + * The above copyright notice and this permission notice shall be included in 12 + * all copies or substantial portions of the Software. 13 + * 14 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 15 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 16 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 17 + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR 18 + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 19 + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 20 + * OTHER DEALINGS IN THE SOFTWARE. 21 + * 22 + */ 23 + 24 + #ifndef __VCN_V2_5_H__ 25 + #define __VCN_V2_5_H__ 26 + 27 + extern const struct amdgpu_ip_block_version vcn_v2_5_ip_block; 28 + 29 + #endif /* __VCN_V2_5_H__ */