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

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

drm/amdgpu: separate PASID mapping from VM flush v2 



Stuffing the PASID mapping into the VM flush isn't flexible enough since
the PASID mapping changes not as often as we need a VM flush.

v2: add missing use of gmc_v7_0_emit_pasid_mapping

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

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

+3 −2
Original line number Diff line number Diff line
@@ -1774,7 +1774,8 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) 
#define amdgpu_asic_flush_hdp(adev, r) (adev)->asic_funcs->flush_hdp((adev), (r))

#define amdgpu_asic_invalidate_hdp(adev, r) (adev)->asic_funcs->invalidate_hdp((adev), (r))

#define amdgpu_gmc_flush_gpu_tlb(adev, vmid) (adev)->gmc.gmc_funcs->flush_gpu_tlb((adev), (vmid))

#define amdgpu_gmc_emit_flush_gpu_tlb(r, vmid, pasid, addr) (r)->adev->gmc.gmc_funcs->emit_flush_gpu_tlb((r), (vmid), (pasid), (addr))

#define amdgpu_gmc_emit_flush_gpu_tlb(r, vmid, addr) (r)->adev->gmc.gmc_funcs->emit_flush_gpu_tlb((r), (vmid), (addr))

#define amdgpu_gmc_emit_pasid_mapping(r, vmid, pasid) (r)->adev->gmc.gmc_funcs->emit_pasid_mapping((r), (vmid), (pasid))

#define amdgpu_gmc_set_pte_pde(adev, pt, idx, addr, flags) (adev)->gmc.gmc_funcs->set_pte_pde((adev), (pt), (idx), (addr), (flags))

#define amdgpu_gmc_get_vm_pde(adev, level, dst, flags) (adev)->gmc.gmc_funcs->get_vm_pde((adev), (level), (dst), (flags))

#define amdgpu_gmc_get_pte_flags(adev, flags) (adev)->gmc.gmc_funcs->get_vm_pte_flags((adev),(flags))
@@ -1789,7 +1790,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, pasid, addr) (r)->funcs->emit_vm_flush((r), (vmid), (pasid), (addr))

#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))

#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_gmc.h

+4 −1
Original line number Diff line number Diff line
@@ -54,7 +54,10 @@ struct amdgpu_gmc_funcs { 
			      uint32_t vmid);

	/* flush the vm tlb via ring */

	uint64_t (*emit_flush_gpu_tlb)(struct amdgpu_ring *ring, unsigned vmid,

				       unsigned pasid, uint64_t pd_addr);

				       uint64_t pd_addr);

	/* Change the VMID -> PASID mapping */

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

				   unsigned pasid);

	/* write pte/pde updates using the cpu */

	int (*set_pte_pde)(struct amdgpu_device *adev,

			   void *cpu_pt_addr, /* cpu addr of page table */

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,

			      unsigned pasid, uint64_t pd_addr);

			      uint64_t pd_addr);

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

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

				uint32_t gds_base, uint32_t gds_size,

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

+5 −2
Original line number Diff line number Diff line
@@ -612,8 +612,11 @@ 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->pasid,

					  job->vm_pd_addr);

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

		if (adev->gmc.gmc_funcs->emit_pasid_mapping &&

		    ring->funcs->emit_wreg)

			amdgpu_gmc_emit_pasid_mapping(ring, job->vmid,

						      job->pasid);



		r = amdgpu_fence_emit(ring, &fence);

		if (r)

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

+2 −3
Original line number Diff line number Diff line
@@ -873,13 +873,12 @@ 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, unsigned pasid,

					uint64_t pd_addr)

					unsigned vmid, uint64_t pd_addr)

{

	u32 extra_bits = (SDMA_POLL_REG_MEM_EXTRA_OP(0) |

			  SDMA_POLL_REG_MEM_EXTRA_FUNC(0)); /* always */



	amdgpu_gmc_emit_flush_gpu_tlb(ring, vmid, pasid, pd_addr);

	amdgpu_gmc_emit_flush_gpu_tlb(ring, vmid, pd_addr);



	amdgpu_ring_write(ring, SDMA_PACKET(SDMA_OPCODE_POLL_REG_MEM, 0, extra_bits));

	amdgpu_ring_write(ring, mmVM_INVALIDATE_REQUEST << 2);