Commit d6ffefcc authored by James Zhu's avatar James Zhu Committed by Alex Deucher
Browse files

drm/amdgpu/discovery: add VCN 4.0 Support 



Enable VCN 4.0 on asics where it is present.

Signed-off-by: default avatarJames Zhu <James.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9ac0edaa

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -68,6 +68,8 @@ 
#include "jpeg_v2_0.h"

#include "jpeg_v2_0.h"

#include "vcn_v3_0.h"

#include "vcn_v3_0.h"

#include "jpeg_v3_0.h"

#include "jpeg_v3_0.h"

#include "vcn_v4_0.h"

#include "jpeg_v4_0.h"

#include "amdgpu_vkms.h"

#include "amdgpu_vkms.h"

#include "mes_v10_1.h"

#include "mes_v10_1.h"

#include "mes_v11_0.h"

#include "mes_v11_0.h"
@@ -1853,6 +1855,10 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct amdgpu_device *adev) 
		case IP_VERSION(3, 0, 33):

		case IP_VERSION(3, 0, 33):

			amdgpu_device_ip_block_add(adev, &vcn_v3_0_ip_block);

			amdgpu_device_ip_block_add(adev, &vcn_v3_0_ip_block);

			break;

			break;

		case IP_VERSION(4, 0, 0):

			amdgpu_device_ip_block_add(adev, &vcn_v4_0_ip_block);

			amdgpu_device_ip_block_add(adev, &jpeg_v4_0_ip_block);

			break;

		default:

		default:

			dev_err(adev->dev,

			dev_err(adev->dev,

				"Failed to add vcn/jpeg ip block(UVD_HWIP:0x%x)\n",

				"Failed to add vcn/jpeg ip block(UVD_HWIP:0x%x)\n",