Commit 1218a2e3 authored by Leo Liu's avatar Leo Liu Committed by Alex Deucher
Browse files

drm/amdgpu: make software ring functions reuseable for newer VCN 



Software ring will be supported only from VCN4

Signed-off-by: default avatarLeo Liu <leo.liu@amd.com>
Reviewed-by: default avatarJames Zhu <James.Zhu@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ed1db32e

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

+11 −12
Original line number Diff line number Diff line
@@ -1728,7 +1728,7 @@ static void vcn_v3_0_dec_ring_set_wptr(struct amdgpu_ring *ring) 
	}

}



static void vcn_v3_0_dec_sw_ring_emit_fence(struct amdgpu_ring *ring, u64 addr,

void vcn_v3_0_dec_sw_ring_emit_fence(struct amdgpu_ring *ring, u64 addr,

      u64 seq, uint32_t flags)

{

	WARN_ON(flags & AMDGPU_FENCE_FLAG_64BIT);
@@ -1740,15 +1740,13 @@ static void vcn_v3_0_dec_sw_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, 
	amdgpu_ring_write(ring, VCN_DEC_SW_CMD_TRAP);

}



static void vcn_v3_0_dec_sw_ring_insert_end(struct amdgpu_ring *ring)

void vcn_v3_0_dec_sw_ring_insert_end(struct amdgpu_ring *ring)

{

	amdgpu_ring_write(ring, VCN_DEC_SW_CMD_END);

}



static void vcn_v3_0_dec_sw_ring_emit_ib(struct amdgpu_ring *ring,

			       struct amdgpu_job *job,

			       struct amdgpu_ib *ib,

			       uint32_t flags)

void vcn_v3_0_dec_sw_ring_emit_ib(struct amdgpu_ring *ring, struct amdgpu_job *job,

        struct amdgpu_ib *ib, uint32_t flags)

{

	uint32_t vmid = AMDGPU_JOB_GET_VMID(job);
@@ -1759,7 +1757,7 @@ static void vcn_v3_0_dec_sw_ring_emit_ib(struct amdgpu_ring *ring, 
	amdgpu_ring_write(ring, ib->length_dw);

}



static void vcn_v3_0_dec_sw_ring_emit_reg_wait(struct amdgpu_ring *ring, uint32_t reg,

void vcn_v3_0_dec_sw_ring_emit_reg_wait(struct amdgpu_ring *ring, uint32_t reg,

        uint32_t val, uint32_t mask)

{

	amdgpu_ring_write(ring, VCN_DEC_SW_CMD_REG_WAIT);
@@ -1768,7 +1766,7 @@ static void vcn_v3_0_dec_sw_ring_emit_reg_wait(struct amdgpu_ring *ring, uint32_ 
	amdgpu_ring_write(ring, val);

}



static void vcn_v3_0_dec_sw_ring_emit_vm_flush(struct amdgpu_ring *ring,

void vcn_v3_0_dec_sw_ring_emit_vm_flush(struct amdgpu_ring *ring,

        uint32_t vmid, uint64_t pd_addr)

{

	struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub];
@@ -1783,7 +1781,8 @@ static void vcn_v3_0_dec_sw_ring_emit_vm_flush(struct amdgpu_ring *ring, 
	vcn_v3_0_dec_sw_ring_emit_reg_wait(ring, data0, data1, mask);

}



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

void vcn_v3_0_dec_sw_ring_emit_wreg(struct amdgpu_ring *ring, uint32_t reg,

      uint32_t val)

{

	amdgpu_ring_write(ring, VCN_DEC_SW_CMD_REG_WRITE);

	amdgpu_ring_write(ring,	reg << 2);

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

+12 −0
Original line number Diff line number Diff line
@@ -26,4 +26,16 @@ 


extern const struct amdgpu_ip_block_version vcn_v3_0_ip_block;



void vcn_v3_0_dec_sw_ring_emit_fence(struct amdgpu_ring *ring, u64 addr,

      u64 seq, uint32_t flags);

void vcn_v3_0_dec_sw_ring_insert_end(struct amdgpu_ring *ring);

void vcn_v3_0_dec_sw_ring_emit_ib(struct amdgpu_ring *ring, struct amdgpu_job *job,

      struct amdgpu_ib *ib, uint32_t flags);

void vcn_v3_0_dec_sw_ring_emit_reg_wait(struct amdgpu_ring *ring, uint32_t reg,

      uint32_t val, uint32_t mask);

void vcn_v3_0_dec_sw_ring_emit_vm_flush(struct amdgpu_ring *ring,

      uint32_t vmid, uint64_t pd_addr);

void vcn_v3_0_dec_sw_ring_emit_wreg(struct amdgpu_ring *ring, uint32_t reg,

      uint32_t val);



#endif /* __VCN_V3_0_H__ */