drm/amdgpu: Fix TLB invalidation request when using semaphore
[ Upstream commit37c58ddf57
] 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:4ed8a03740
("drm/amdgpu: invalidate mmhub semaphore workaround in gmc9/gmc10") Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Reviewed-by: Yong Zhao <Yong.Zhao@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
f6fccb0a0e
commit
f3c478104a
|
@ -230,7 +230,8 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,
|
||||||
unsigned int vmhub, uint32_t flush_type)
|
unsigned int vmhub, uint32_t flush_type)
|
||||||
{
|
{
|
||||||
struct amdgpu_vmhub *hub = &adev->vmhub[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 */
|
/* Use register 17 for GART */
|
||||||
const unsigned eng = 17;
|
const unsigned eng = 17;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
@ -258,7 +259,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");
|
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
|
* Issue a dummy read to wait for the ACK register to be cleared
|
||||||
|
|
|
@ -487,13 +487,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);
|
bool use_semaphore = gmc_v9_0_use_invalidate_semaphore(adev, vmhub);
|
||||||
const unsigned eng = 17;
|
const unsigned eng = 17;
|
||||||
u32 j, tmp;
|
u32 j, inv_req, tmp;
|
||||||
struct amdgpu_vmhub *hub;
|
struct amdgpu_vmhub *hub;
|
||||||
|
|
||||||
BUG_ON(vmhub >= adev->num_vmhubs);
|
BUG_ON(vmhub >= adev->num_vmhubs);
|
||||||
|
|
||||||
hub = &adev->vmhub[vmhub];
|
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
|
/* This is necessary for a HW workaround under SRIOV as well
|
||||||
* as GFXOFF under bare metal
|
* as GFXOFF under bare metal
|
||||||
|
@ -504,7 +504,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 req = hub->vm_inv_eng0_req + eng;
|
||||||
uint32_t ack = hub->vm_inv_eng0_ack + 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);
|
1 << vmid);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -532,7 +532,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");
|
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
|
* Issue a dummy read to wait for the ACK register to be cleared
|
||||||
|
|
Loading…
Reference in New Issue