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

drm/amdgpu: add vcn ip block and type

Signed-off-by: Leo Liu <leo.liu@amd.com>
Acked-by: Chunming Zhou <david1.zhou@amd.com>
Acked-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Leo Liu and committed by
Alex Deucher
3ea975e4 a319f444

+40 -1
+9
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
··· 756 756 adev->vcn.irq.num_types = 1; 757 757 adev->vcn.irq.funcs = &vcn_v1_0_irq_funcs; 758 758 } 759 + 760 + const struct amdgpu_ip_block_version vcn_v1_0_ip_block = 761 + { 762 + .type = AMD_IP_BLOCK_TYPE_VCN, 763 + .major = 1, 764 + .minor = 0, 765 + .rev = 0, 766 + .funcs = &vcn_v1_0_ip_funcs, 767 + };
+29
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.h
··· 1 + /* 2 + * Copyright 2016 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_V1_0_H__ 25 + #define __VCN_V1_0_H__ 26 + 27 + extern const struct amdgpu_ip_block_version vcn_v1_0_ip_block; 28 + 29 + #endif
+2 -1
drivers/gpu/drm/amd/include/amd_shared.h
··· 77 77 AMD_IP_BLOCK_TYPE_VCE, 78 78 AMD_IP_BLOCK_TYPE_ACP, 79 79 AMD_IP_BLOCK_TYPE_GFXHUB, 80 - AMD_IP_BLOCK_TYPE_MMHUB 80 + AMD_IP_BLOCK_TYPE_MMHUB, 81 + AMD_IP_BLOCK_TYPE_VCN 81 82 }; 82 83 83 84 enum amd_clockgating_state {