Commit 5a4633c4 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: forward pasid to backend flush implementations 



rd the pasid from the VM code to the emit_vm_flush function and update
all implementations with the new parameter.

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

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

+3 −2
Original line number Diff line number Diff line
@@ -1056,8 +1056,9 @@ struct amdgpu_job { 
	void			*owner;

	uint64_t		fence_ctx; /* the fence_context this job uses */

	bool                    vm_needs_flush;

	unsigned		vmid;

	uint64_t		vm_pd_addr;

	unsigned		vmid;

	unsigned		pasid;

	uint32_t		gds_base, gds_size;

	uint32_t		gws_base, gws_size;

	uint32_t		oa_base, oa_size;
@@ -1790,7 +1791,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) 
#define amdgpu_ring_set_wptr(r) (r)->funcs->set_wptr((r))

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

#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_vm_flush(r, vmid, pasid, addr) (r)->funcs->emit_vm_flush((r), (vmid), (pasid), (addr))

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

#define amdgpu_ring_emit_gds_switch(r, v, db, ds, wb, ws, ab, as) (r)->funcs->emit_gds_switch((r), (v), (db), (ds), (wb), (ws), (ab), (as))

#define amdgpu_ring_emit_hdp_flush(r) (r)->funcs->emit_hdp_flush((r))

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

+2 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ static int amdgpu_vmid_grab_reserved_locked(struct amdgpu_vm *vm, 
		id->last_flush = NULL;

	}

	job->vmid = id - id_mgr->ids;

	job->pasid = vm->pasid;

	trace_amdgpu_vm_grab_id(vm, ring, job);

out:

	return r;
@@ -388,6 +389,7 @@ no_flush_needed: 
	list_move_tail(&id->list, &id_mgr->ids_lru);



	job->vmid = id - id_mgr->ids;

	job->pasid = vm->pasid;

	trace_amdgpu_vm_grab_id(vm, ring, job);



error:

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

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ struct amdgpu_ring_funcs { 
			   uint64_t seq, unsigned flags);

	void (*emit_pipeline_sync)(struct amdgpu_ring *ring);

	void (*emit_vm_flush)(struct amdgpu_ring *ring, unsigned vmid,

			      uint64_t pd_addr);

			      unsigned pasid, uint64_t pd_addr);

	void (*emit_hdp_flush)(struct amdgpu_ring *ring);

	void (*emit_hdp_invalidate)(struct amdgpu_ring *ring);

	void (*emit_gds_switch)(struct amdgpu_ring *ring, uint32_t vmid,

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

+2 −1
Original line number Diff line number Diff line
@@ -513,7 +513,8 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job, bool need_ 
		struct dma_fence *fence;



		trace_amdgpu_vm_flush(ring, job->vmid, job->vm_pd_addr);

		amdgpu_ring_emit_vm_flush(ring, job->vmid, job->vm_pd_addr);

		amdgpu_ring_emit_vm_flush(ring, job->vmid, job->pasid,

					  job->vm_pd_addr);



		r = amdgpu_fence_emit(ring, &fence);

		if (r)

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

+2 −1
Original line number Diff line number Diff line
@@ -880,7 +880,8 @@ static void cik_sdma_ring_emit_pipeline_sync(struct amdgpu_ring *ring) 
 * using sDMA (CIK).

 */

static void cik_sdma_ring_emit_vm_flush(struct amdgpu_ring *ring,

					unsigned vmid, uint64_t pd_addr)

					unsigned vmid, unsigned pasid,

					uint64_t pd_addr)

{

	u32 extra_bits = (SDMA_POLL_REG_MEM_EXTRA_OP(0) |

			  SDMA_POLL_REG_MEM_EXTRA_FUNC(0)); /* always */

CRA Git | Maintained and supported by SUSTech CRA and CCSE