diff options
author | Christian König <christian.koenig@amd.com> | 2017-06-28 07:50:07 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-07-14 11:05:56 -0400 |
commit | 369421cbfabf0650b73571d7d1c026fc3830e74d (patch) | |
tree | b9b07c03b1766184e47d1db4cb1708c70df3068a /drivers/gpu/drm/amd/amdgpu | |
parent | e8110b1c9bdd3d76610a9783724233a570964d3c (diff) |
drm/amdgpu: fix amdgpu_ring_write_multiple
Overwriting still used ring content has a low probability to cause
problems, not writing at all has 100% probability to cause problems.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h index 04cbc3a4d4bf..322d25299a00 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | |||
@@ -227,10 +227,8 @@ static inline void amdgpu_ring_write_multiple(struct amdgpu_ring *ring, | |||
227 | unsigned occupied, chunk1, chunk2; | 227 | unsigned occupied, chunk1, chunk2; |
228 | void *dst; | 228 | void *dst; |
229 | 229 | ||
230 | if (unlikely(ring->count_dw < count_dw)) { | 230 | if (unlikely(ring->count_dw < count_dw)) |
231 | DRM_ERROR("amdgpu: writing more dwords to the ring than expected!\n"); | 231 | DRM_ERROR("amdgpu: writing more dwords to the ring than expected!\n"); |
232 | return; | ||
233 | } | ||
234 | 232 | ||
235 | occupied = ring->wptr & ring->buf_mask; | 233 | occupied = ring->wptr & ring->buf_mask; |
236 | dst = (void *)&ring->ring[occupied]; | 234 | dst = (void *)&ring->ring[occupied]; |