Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4c905ec authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher
Browse files

drm/amdgpu: add flags to emit_ib interface v2 



Replace the last bool type parameter with a general flags parameter,
to make the last parameter be able to contain more information.

v2: drop setting need_ctx_switch = false

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a7cd9771

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

+5 −5
Original line number Diff line number Diff line
@@ -202,12 +202,12 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
			amdgpu_asic_flush_hdp(adev, ring);

	}



	skip_preamble = ring->current_ctx == fence_ctx;

	if (job && ring->funcs->emit_cntxcntl) {

	if (need_ctx_switch)

		status |= AMDGPU_HAVE_CTX_SWITCH;

		status |= job->preamble_status;



	skip_preamble = ring->current_ctx == fence_ctx;

	if (job && ring->funcs->emit_cntxcntl) {

		status |= job->preamble_status;

		amdgpu_ring_emit_cntxcntl(ring, status);

	}
@@ -221,8 +221,8 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
			!amdgpu_sriov_vf(adev)) /* for SRIOV preemption, Preamble CE ib must be inserted anyway */

			continue;



		amdgpu_ring_emit_ib(ring, job, ib, need_ctx_switch);

		need_ctx_switch = false;

		amdgpu_ring_emit_ib(ring, job, ib, status);

		status &= ~AMDGPU_HAVE_CTX_SWITCH;

	}



	if (ring->funcs->emit_tmz)

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

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ struct amdgpu_ring_funcs { 
	void (*emit_ib)(struct amdgpu_ring *ring,

			struct amdgpu_job *job,

			struct amdgpu_ib *ib,

			bool ctx_switch);

			uint32_t flags);

	void (*emit_fence)(struct amdgpu_ring *ring, uint64_t addr,

			   uint64_t seq, unsigned flags);

	void (*emit_pipeline_sync)(struct amdgpu_ring *ring);
@@ -229,7 +229,7 @@ struct amdgpu_ring { 
#define amdgpu_ring_get_rptr(r) (r)->funcs->get_rptr((r))

#define amdgpu_ring_get_wptr(r) (r)->funcs->get_wptr((r))

#define amdgpu_ring_set_wptr(r) (r)->funcs->set_wptr((r))

#define amdgpu_ring_emit_ib(r, job, ib, c) ((r)->funcs->emit_ib((r), (job), (ib), (c)))

#define amdgpu_ring_emit_ib(r, job, ib, flags) ((r)->funcs->emit_ib((r), (job), (ib), (flags)))

#define amdgpu_ring_emit_pipeline_sync(r) (r)->funcs->emit_pipeline_sync((r))

#define amdgpu_ring_emit_vm_flush(r, vmid, addr) (r)->funcs->emit_vm_flush((r), (vmid), (addr))

#define amdgpu_ring_emit_fence(r, addr, seq, flags) (r)->funcs->emit_fence((r), (addr), (seq), (flags))

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

+1 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ int amdgpu_vce_ring_parse_cs_vm(struct amdgpu_cs_parser *p, uint32_t ib_idx) 
void amdgpu_vce_ring_emit_ib(struct amdgpu_ring *ring,

				struct amdgpu_job *job,

				struct amdgpu_ib *ib,

				bool ctx_switch)

				uint32_t flags)

{

	amdgpu_ring_write(ring, VCE_CMD_IB);

	amdgpu_ring_write(ring, lower_32_bits(ib->gpu_addr));

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

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ void amdgpu_vce_free_handles(struct amdgpu_device *adev, struct drm_file *filp); 
int amdgpu_vce_ring_parse_cs(struct amdgpu_cs_parser *p, uint32_t ib_idx);

int amdgpu_vce_ring_parse_cs_vm(struct amdgpu_cs_parser *p, uint32_t ib_idx);

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

				struct amdgpu_ib *ib, bool ctx_switch);

				struct amdgpu_ib *ib, uint32_t flags);

void amdgpu_vce_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seq,

				unsigned flags);

int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring);

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

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static void cik_sdma_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count) 
static void cik_sdma_ring_emit_ib(struct amdgpu_ring *ring,

				  struct amdgpu_job *job,

				  struct amdgpu_ib *ib,

				  bool ctx_switch)

				  uint32_t flags)

{

	unsigned vmid = AMDGPU_JOB_GET_VMID(job);

	u32 extra_bits = vmid & 0xf;