Commit 3ee8fb70 authored by Lang Yu's avatar Lang Yu Committed by Alex Deucher
Browse files

drm/amdgpu: enable VPE for VPE 6.1.0 



Enable Video Processing Engine on SoCs
that contain VPE 6.1.0.

Signed-off-by: default avatarLang Yu <Lang.Yu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 523c1280

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

+19 −0
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ 
#include "smuio_v13_0_3.h"

#include "smuio_v13_0_6.h"



#include "amdgpu_vpe.h"



#define FIRMWARE_IP_DISCOVERY "amdgpu/ip_discovery.bin"

MODULE_FIRMWARE(FIRMWARE_IP_DISCOVERY);
@@ -2139,6 +2141,19 @@ static void amdgpu_discovery_init_soc_config(struct amdgpu_device *adev) 
	}

}



static int amdgpu_discovery_set_vpe_ip_blocks(struct amdgpu_device *adev)

{

	switch (adev->ip_versions[VPE_HWIP][0]) {

	case IP_VERSION(6, 1, 0):

		amdgpu_device_ip_block_add(adev, &vpe_v6_1_ip_block);

		break;

	default:

		break;

	}



	return 0;

}



int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)

{

	int r;
@@ -2626,6 +2641,10 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev) 
	if (r)

		return r;



	r = amdgpu_discovery_set_vpe_ip_blocks(adev);

	if (r)

		return r;



	return 0;

}