Commit f87f6864 authored by Mukul Joshi's avatar Mukul Joshi Committed by Alex Deucher
Browse files

drm/amdgpu: Add XCC inst to PASID TLB flushing 



Add XCC instance to select the correct KIQ ring when
flushing TLBs on a multi-XCC setup.

Signed-off-by: default avatarMukul Joshi <mukul.joshi@amd.com>
Tested-by: default avatarAmber Lin <Amber.Lin@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e2069a7b

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

+4 −2
Original line number Diff line number Diff line
@@ -743,7 +743,9 @@ int amdgpu_amdkfd_flush_gpu_tlb_vmid(struct amdgpu_device *adev, 
}



int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct amdgpu_device *adev,

				      uint16_t pasid, enum TLB_FLUSH_TYPE flush_type)

				      uint16_t pasid,

				      enum TLB_FLUSH_TYPE flush_type,

				      uint32_t inst)

{

	bool all_hub = false;
@@ -751,7 +753,7 @@ int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct amdgpu_device *adev, 
	    adev->family == AMDGPU_FAMILY_RV)

		all_hub = true;



	return amdgpu_gmc_flush_gpu_tlb_pasid(adev, pasid, flush_type, all_hub);

	return amdgpu_gmc_flush_gpu_tlb_pasid(adev, pasid, flush_type, all_hub, inst);

}



bool amdgpu_amdkfd_have_atomics_support(struct amdgpu_device *adev)

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

+2 −1
Original line number Diff line number Diff line
@@ -160,7 +160,8 @@ bool amdgpu_amdkfd_have_atomics_support(struct amdgpu_device *adev); 
int amdgpu_amdkfd_flush_gpu_tlb_vmid(struct amdgpu_device *adev,

				uint16_t vmid);

int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct amdgpu_device *adev,

				uint16_t pasid, enum TLB_FLUSH_TYPE flush_type);

				uint16_t pasid, enum TLB_FLUSH_TYPE flush_type,

				uint32_t inst);



bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid);

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

+4 −3
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ struct amdgpu_gmc_funcs { 
				uint32_t vmhub, uint32_t flush_type);

	/* flush the vm tlb via pasid */

	int (*flush_gpu_tlb_pasid)(struct amdgpu_device *adev, uint16_t pasid,

					uint32_t flush_type, bool all_hub);

					uint32_t flush_type, bool all_hub,

					uint32_t inst);

	/* flush the vm tlb via ring */

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

				       uint64_t pd_addr);
@@ -296,9 +297,9 @@ struct amdgpu_gmc { 
};



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

#define amdgpu_gmc_flush_gpu_tlb_pasid(adev, pasid, type, allhub) \

#define amdgpu_gmc_flush_gpu_tlb_pasid(adev, pasid, type, allhub, inst) \

	((adev)->gmc.gmc_funcs->flush_gpu_tlb_pasid \

	((adev), (pasid), (type), (allhub)))

	((adev), (pasid), (type), (allhub), (inst)))

#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_map_mtype(adev, flags) (adev)->gmc.gmc_funcs->map_mtype((adev),(flags))

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

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ static void gmc_v10_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, 
 */

static int gmc_v10_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,

					uint16_t pasid, uint32_t flush_type,

					bool all_hub)

					bool all_hub, uint32_t inst)

{

	int vmid, i;

	signed long r;

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

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ static void gmc_v11_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, 
 */

static int gmc_v11_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,

					uint16_t pasid, uint32_t flush_type,

					bool all_hub)

					bool all_hub, uint32_t inst)

{

	int vmid, i;

	signed long r;