Commit 21cd942e authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: move the ring type into the funcs structure (v2) 



It's constant, so it doesn't make to much sense to keep it
with the variable data.

v2: update vce and uvd phys mode ring structures as well

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e12f3d7a

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

+2 −2
Original line number Diff line number Diff line
@@ -942,8 +942,8 @@ static int amdgpu_cs_ib_fill(struct amdgpu_device *adev, 


	/* UVD & VCE fw doesn't support user fences */

	if (parser->job->uf_addr && (

	    parser->job->ring->type == AMDGPU_RING_TYPE_UVD ||

	    parser->job->ring->type == AMDGPU_RING_TYPE_VCE))

	    parser->job->ring->funcs->type == AMDGPU_RING_TYPE_UVD ||

	    parser->job->ring->funcs->type == AMDGPU_RING_TYPE_VCE))

		return -EINVAL;



	return 0;

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

+1 −3
Original line number Diff line number Diff line
@@ -164,8 +164,7 @@ void amdgpu_ring_undo(struct amdgpu_ring *ring) 
 */

int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,

		     unsigned max_dw, u32 nop, u32 align_mask,

		     struct amdgpu_irq_src *irq_src, unsigned irq_type,

		     enum amdgpu_ring_type ring_type)

		     struct amdgpu_irq_src *irq_src, unsigned irq_type)

{

	int r;
@@ -218,7 +217,6 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, 
					     amdgpu_sched_hw_submission);

	ring->align_mask = align_mask;

	ring->nop = nop;

	ring->type = ring_type;



	/* Allocate ring buffer */

	if (ring->ring_obj == NULL) {

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

+3 −3
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ unsigned amdgpu_fence_count_emitted(struct amdgpu_ring *ring); 


/* provided by hw blocks that expose a ring buffer for commands */

struct amdgpu_ring_funcs {

	enum amdgpu_ring_type	type;



	/* ring read/write ptr handling */

	u32 (*get_rptr)(struct amdgpu_ring *ring);

	u32 (*get_wptr)(struct amdgpu_ring *ring);
@@ -161,7 +163,6 @@ struct amdgpu_ring { 
	unsigned		wptr_offs;

	unsigned		fence_offs;

	uint64_t		current_ctx;

	enum amdgpu_ring_type	type;

	char			name[16];

	unsigned		cond_exe_offs;

	u64			cond_exe_gpu_addr;
@@ -178,8 +179,7 @@ void amdgpu_ring_commit(struct amdgpu_ring *ring); 
void amdgpu_ring_undo(struct amdgpu_ring *ring);

int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,

		     unsigned ring_size, u32 nop, u32 align_mask,

		     struct amdgpu_irq_src *irq_src, unsigned irq_type,

		     enum amdgpu_ring_type ring_type);

		     struct amdgpu_irq_src *irq_src, unsigned irq_type);

void amdgpu_ring_fini(struct amdgpu_ring *ring);



#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static bool amdgpu_vm_ring_has_compute_vm_bug(struct amdgpu_ring *ring) 
	struct amdgpu_device *adev = ring->adev;

	const struct amdgpu_ip_block_version *ip_block;



	if (ring->type != AMDGPU_RING_TYPE_COMPUTE)

	if (ring->funcs->type != AMDGPU_RING_TYPE_COMPUTE)

		/* only compute rings */

		return false;

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

+3 −2
Original line number Diff line number Diff line
@@ -946,8 +946,8 @@ static int cik_sdma_sw_init(void *handle) 
				     SDMA_PACKET(SDMA_OPCODE_NOP, 0, 0), 0xf,

				     &adev->sdma.trap_irq,

				     (i == 0) ?

				     AMDGPU_SDMA_IRQ_TRAP0 : AMDGPU_SDMA_IRQ_TRAP1,

				     AMDGPU_RING_TYPE_SDMA);

				     AMDGPU_SDMA_IRQ_TRAP0 :

				     AMDGPU_SDMA_IRQ_TRAP1);

		if (r)

			return r;

	}
@@ -1209,6 +1209,7 @@ const struct amd_ip_funcs cik_sdma_ip_funcs = { 
};



static const struct amdgpu_ring_funcs cik_sdma_ring_funcs = {

	.type = AMDGPU_RING_TYPE_SDMA,

	.get_rptr = cik_sdma_ring_get_rptr,

	.get_wptr = cik_sdma_ring_get_wptr,

	.set_wptr = cik_sdma_ring_set_wptr,

CRA Git | Maintained and supported by SUSTech CRA and CCSE