Commit 37c58ddf authored by Felix Kuehling's avatar Felix Kuehling Committed by Alex Deucher
Browse files

drm/amdgpu: Fix TLB invalidation request when using semaphore 



Use a more meaningful variable name for the invalidation request
that is distinct from the tmp variable that gets overwritten when
acquiring the invalidation semaphore.

Fixes: 4ed8a037 ("drm/amdgpu: invalidate mmhub semaphore workaround in gmc9/gmc10")
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarYong Zhao <Yong.Zhao@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d4786672

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

+3 −2
Original line number Diff line number Diff line
@@ -262,7 +262,8 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid, 
{

	bool use_semaphore = gmc_v10_0_use_invalidate_semaphore(adev, vmhub);

	struct amdgpu_vmhub *hub = &adev->vmhub[vmhub];

	u32 tmp = gmc_v10_0_get_invalidate_req(vmid, flush_type);

	u32 inv_req = gmc_v10_0_get_invalidate_req(vmid, flush_type);

	u32 tmp;

	/* Use register 17 for GART */

	const unsigned eng = 17;

	unsigned int i;
@@ -289,7 +290,7 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid, 
			DRM_ERROR("Timeout waiting for sem acquire in VM flush!\n");

	}



	WREG32_NO_KIQ(hub->vm_inv_eng0_req + eng, tmp);

	WREG32_NO_KIQ(hub->vm_inv_eng0_req + eng, inv_req);



	/*

	 * Issue a dummy read to wait for the ACK register to be cleared

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

+4 −4
Original line number Diff line number Diff line
@@ -476,13 +476,13 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, 
{

	bool use_semaphore = gmc_v9_0_use_invalidate_semaphore(adev, vmhub);

	const unsigned eng = 17;

	u32 j, tmp;

	u32 j, inv_req, tmp;

	struct amdgpu_vmhub *hub;



	BUG_ON(vmhub >= adev->num_vmhubs);



	hub = &adev->vmhub[vmhub];

	tmp = gmc_v9_0_get_invalidate_req(vmid, flush_type);

	inv_req = gmc_v9_0_get_invalidate_req(vmid, flush_type);



	/* This is necessary for a HW workaround under SRIOV as well

	 * as GFXOFF under bare metal
@@ -493,7 +493,7 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, 
		uint32_t req = hub->vm_inv_eng0_req + eng;

		uint32_t ack = hub->vm_inv_eng0_ack + eng;



		amdgpu_virt_kiq_reg_write_reg_wait(adev, req, ack, tmp,

		amdgpu_virt_kiq_reg_write_reg_wait(adev, req, ack, inv_req,

				1 << vmid);

		return;

	}
@@ -521,7 +521,7 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, 
			DRM_ERROR("Timeout waiting for sem acquire in VM flush!\n");

	}



	WREG32_NO_KIQ(hub->vm_inv_eng0_req + eng, tmp);

	WREG32_NO_KIQ(hub->vm_inv_eng0_req + eng, inv_req);



	/*

	 * Issue a dummy read to wait for the ACK register to be cleared

CRA Git | Maintained and supported by SUSTech CRA and CCSE