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

drm/amdgpu: drop error return from flush_gpu_tlb_pasid 



That function never fails, drop the error return.

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

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

+4 −3
Original line number Diff line number Diff line
@@ -645,9 +645,10 @@ int amdgpu_gmc_flush_gpu_tlb_pasid(struct amdgpu_device *adev, uint16_t pasid, 


	if (!adev->gmc.flush_pasid_uses_kiq || !ring->sched.ready ||

	    !down_read_trylock(&adev->reset_domain->sem)) {

		return adev->gmc.gmc_funcs->flush_gpu_tlb_pasid(adev, pasid,

								flush_type,

								all_hub, inst);

		adev->gmc.gmc_funcs->flush_gpu_tlb_pasid(adev, pasid,

							 flush_type, all_hub,

							 inst);

		return 0;

	}



	/* 2 dwords flush + 8 dwords fence */

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

+3 −3
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ struct amdgpu_gmc_funcs { 
	void (*flush_gpu_tlb)(struct amdgpu_device *adev, uint32_t vmid,

				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,

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

				    uint32_t flush_type, bool all_hub,

				    uint32_t inst);

	/* flush the vm tlb via ring */

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

+3 −4
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static void gmc_v10_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, 
 *

 * Flush the TLB for the requested pasid.

 */

static int gmc_v10_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,

static void gmc_v10_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,

					  uint16_t pasid, uint32_t flush_type,

					  bool all_hub, uint32_t inst)

{
@@ -364,7 +364,6 @@ static int gmc_v10_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev, 
						flush_type);

		}

	}

	return 0;

}



static uint64_t gmc_v10_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,

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

+3 −4
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ static void gmc_v11_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, 
 *

 * Flush the TLB for the requested pasid.

 */

static int gmc_v11_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,

static void gmc_v11_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,

					  uint16_t pasid, uint32_t flush_type,

					  bool all_hub, uint32_t inst)

{
@@ -324,7 +324,6 @@ static int gmc_v11_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev, 
						flush_type);

		}

	}

	return 0;

}



static uint64_t gmc_v11_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,

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

+4 −5
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static int gmc_v7_0_mc_init(struct amdgpu_device *adev) 
 *

 * Flush the TLB for the requested pasid.

 */

static int gmc_v7_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,

static void gmc_v7_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,

					 uint16_t pasid, uint32_t flush_type,

					 bool all_hub, uint32_t inst)

{
@@ -431,7 +431,7 @@ static int gmc_v7_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev, 
	int vmid;



	if (!down_read_trylock(&adev->reset_domain->sem))

		return 0;

		return;



	for (vmid = 1; vmid < 16; vmid++) {

		u32 tmp = RREG32(mmATC_VMID0_PASID_MAPPING + vmid);
@@ -444,7 +444,6 @@ static int gmc_v7_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev, 
	WREG32(mmVM_INVALIDATE_REQUEST, mask);

	RREG32(mmVM_INVALIDATE_RESPONSE);

	up_read(&adev->reset_domain->sem);

	return 0;

}



/*