drm/amdgpu: enable VCN2.5 on Arcturus (08249a3a) · Commits · 戴 / test

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@
		#include "uvd_v7_0.h"
		#include "vce_v4_0.h"
		#include "vcn_v1_0.h"
		#include "vcn_v2_5.h"
		#include "dce_virtual.h"
		#include "mxgpu_ai.h"
		#include "amdgpu_smu.h"
		@@ -684,6 +685,7 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
		amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
		amdgpu_device_ip_block_add(adev, &gfx_v9_0_ip_block);
		amdgpu_device_ip_block_add(adev, &sdma_v4_0_ip_block);
		amdgpu_device_ip_block_add(adev, &vcn_v2_5_ip_block);
		break;
		default:
		return -EINVAL;

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2019 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_V2_5_H__
		#define __VCN_V2_5_H__

		extern const struct amdgpu_ip_block_version vcn_v2_5_ip_block;

		#endif /* __VCN_V2_5_H__ */