Commit 26f5f34e authored by Lang Yu's avatar Lang Yu Committed by Alex Deucher
Browse files

drm/amdgpu/vpe: add collaborate mode support for VPE 



Under clollaborate mode, multiple VPE instances share a ring buferr
and work together to finish a job.

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

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

+20 −0
Original line number Diff line number Diff line
@@ -457,6 +457,18 @@ static uint64_t vpe_get_csa_mc_addr(struct amdgpu_ring *ring, uint32_t vmid) 
	return csa_mc_addr;

}



static void vpe_ring_emit_pred_exec(struct amdgpu_ring *ring,

				    uint32_t device_select,

				    uint32_t exec_count)

{

	if (!ring->adev->vpe.collaborate_mode)

		return;



	amdgpu_ring_write(ring, VPE_CMD_HEADER(VPE_CMD_OPCODE_PRED_EXE, 0) |

				(device_select << 16));

	amdgpu_ring_write(ring, exec_count & 0x1fff);

}



static void vpe_ring_emit_ib(struct amdgpu_ring *ring,

			     struct amdgpu_job *job,

			     struct amdgpu_ib *ib,
@@ -481,6 +493,8 @@ static void vpe_ring_emit_fence(struct amdgpu_ring *ring, uint64_t addr, 
{

	int i = 0;



	vpe_ring_emit_pred_exec(ring, 0, 10);



	do {

		/* write the fence */

		amdgpu_ring_write(ring, VPE_CMD_HEADER(VPE_CMD_OPCODE_FENCE, 0));
@@ -505,6 +519,8 @@ static void vpe_ring_emit_pipeline_sync(struct amdgpu_ring *ring) 
	uint32_t seq = ring->fence_drv.sync_seq;

	uint64_t addr = ring->fence_drv.gpu_addr;



	vpe_ring_emit_pred_exec(ring, 0, 6);



	/* wait for idle */

	amdgpu_ring_write(ring, VPE_CMD_HEADER(VPE_CMD_OPCODE_POLL_REGMEM,

				VPE_POLL_REGMEM_SUBOP_REGMEM) |
@@ -520,6 +536,8 @@ static void vpe_ring_emit_pipeline_sync(struct amdgpu_ring *ring) 


static void vpe_ring_emit_wreg(struct amdgpu_ring *ring, uint32_t reg, uint32_t val)

{

	vpe_ring_emit_pred_exec(ring, 0, 3);



	amdgpu_ring_write(ring, VPE_CMD_HEADER(VPE_CMD_OPCODE_REG_WRITE, 0));

	amdgpu_ring_write(ring,	reg << 2);

	amdgpu_ring_write(ring, val);
@@ -528,6 +546,8 @@ static void vpe_ring_emit_wreg(struct amdgpu_ring *ring, uint32_t reg, uint32_t 
static void vpe_ring_emit_reg_wait(struct amdgpu_ring *ring, uint32_t reg,

				   uint32_t val, uint32_t mask)

{

	vpe_ring_emit_pred_exec(ring, 0, 6);



	amdgpu_ring_write(ring, VPE_CMD_HEADER(VPE_CMD_OPCODE_POLL_REGMEM,

				VPE_POLL_REGMEM_SUBOP_REGMEM) |

				VPE_CMD_POLL_REGMEM_HEADER_FUNC(3) | /* equal */

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

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ struct amdgpu_vpe { 
	bool				context_started;



	uint32_t			num_instances;

	bool				collaborate_mode;

};



int amdgpu_vpe_psp_update_sram(struct amdgpu_device *adev);