diff options
| author | Philip Yang <[email protected]> | 2021-04-18 02:37:21 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2021-04-29 03:36:05 +0000 |
| commit | 11dd55d1743881c7c8f62171066292fc034e1c3c (patch) | |
| tree | 0e617d7a70aec81e4d278cb76df6a92722fea039 /drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | |
| parent | drm/amdkfd: retry validation to recover range (diff) | |
| download | kernel-11dd55d1743881c7c8f62171066292fc034e1c3c.tar.gz kernel-11dd55d1743881c7c8f62171066292fc034e1c3c.zip | |
drm/amdgpu: return IH ring drain finished if ring is empty
Sometimes IH do not setup ring wptr overflow flag after wptr exceed
rptr. As a workaround, if IH rptr equals to wptr, ring is empty,
return true to indicate IH ring checkpoint is processed, IH ring drain
is finished.
Signed-off-by: Philip Yang <[email protected]>
Reviewed-by: Felix Kuehling <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c index faaa6aa2faaf..a36e191cf086 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c @@ -175,7 +175,9 @@ static bool amdgpu_ih_has_checkpoint_processed(struct amdgpu_device *adev, cur_rptr += ih->ptr_mask + 1; *prev_rptr = cur_rptr; - return cur_rptr >= checkpoint_wptr; + /* check ring is empty to workaround missing wptr overflow flag */ + return cur_rptr >= checkpoint_wptr || + (cur_rptr & ih->ptr_mask) == amdgpu_ih_get_wptr(adev, ih); } /** |