Commit 709ef39f authored by Lang Yu's avatar Lang Yu Committed by Alex Deucher
Browse files

drm/amdgpu/vpe: add multi instance VPE support 



Add support for multi instance VPE processing.

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

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

+9 −0
Original line number Diff line number Diff line
@@ -1320,6 +1320,15 @@ static int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev) 
				}

			}



			if (le16_to_cpu(ip->hw_id) == VPE_HWID) {

				if (adev->vpe.num_instances < AMDGPU_MAX_VPE_INSTANCES)

					adev->vpe.num_instances++;

				else

					dev_err(adev->dev, "Too many VPE instances: %d vs %d\n",

						adev->vpe.num_instances + 1,

						AMDGPU_MAX_VPE_INSTANCES);

			}



			if (le16_to_cpu(ip->hw_id) == UMC_HWID) {

				adev->gmc.num_umc++;

				adev->umc.node_inst_num++;

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

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include "amdgpu_irq.h"

#include "vpe_6_1_fw_if.h"



#define AMDGPU_MAX_VPE_INSTANCES 2



struct amdgpu_vpe;



struct vpe_funcs {
@@ -74,6 +76,8 @@ struct amdgpu_vpe { 
	uint32_t			*cmdbuf_cpu_addr;

	struct delayed_work		idle_work;

	bool				context_started;



	uint32_t			num_instances;

};



int amdgpu_vpe_psp_update_sram(struct amdgpu_device *adev);