Commit 3ea975e4 authored by Leo Liu's avatar Leo Liu Committed by Alex Deucher
Browse files

drm/amdgpu: add vcn ip block and type 



Signed-off-by: default avatarLeo Liu <leo.liu@amd.com>
Acked-by: default avatarChunming Zhou <david1.zhou@amd.com>
Acked-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a319f444

drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c

+9 −0
Original line number Diff line number Diff line
@@ -756,3 +756,12 @@ static void vcn_v1_0_set_irq_funcs(struct amdgpu_device *adev) 
	adev->vcn.irq.num_types = 1;

	adev->vcn.irq.funcs = &vcn_v1_0_irq_funcs;

}



const struct amdgpu_ip_block_version vcn_v1_0_ip_block =

{

		.type = AMD_IP_BLOCK_TYPE_VCN,

		.major = 1,

		.minor = 0,

		.rev = 0,

		.funcs = &vcn_v1_0_ip_funcs,

};

drivers/gpu/drm/amd/amdgpu/vcn_v1_0.h

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2016 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 */



#ifndef __VCN_V1_0_H__

#define __VCN_V1_0_H__



extern const struct amdgpu_ip_block_version vcn_v1_0_ip_block;



#endif

drivers/gpu/drm/amd/include/amd_shared.h

+2 −1
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ enum amd_ip_block_type { 
	AMD_IP_BLOCK_TYPE_VCE,

	AMD_IP_BLOCK_TYPE_ACP,

	AMD_IP_BLOCK_TYPE_GFXHUB,

	AMD_IP_BLOCK_TYPE_MMHUB

	AMD_IP_BLOCK_TYPE_MMHUB,

	AMD_IP_BLOCK_TYPE_VCN

};



enum amd_clockgating_state {