diff options
| author | Mark Brown <broonie@kernel.org> | 2019-07-24 17:00:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-07-24 17:00:06 +0100 |
| commit | 27988c96687667e74df1a9a3b8662519bc1c29c9 (patch) | |
| tree | 0aa67d365e8d544bf48a4de9ae94d7f8536de073 /drivers/gpu/drm/amd/amdgpu/si_dma.c | |
| parent | 8f46e22b5ac692b48d04bb722547ca17b66dda02 (diff) | |
| parent | 5f9e832c137075045d15cd6899ab0505cfb2ca4b (diff) | |
| download | talos-op-linux-27988c96687667e74df1a9a3b8662519bc1c29c9.tar.gz talos-op-linux-27988c96687667e74df1a9a3b8662519bc1c29c9.zip | |
Merge tag 'v5.3-rc1' into regulator-5.3
Linus 5.3-rc1
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/si_dma.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/si_dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdgpu/si_dma.c index 3eeefd40dae0..bdda8b4e03f0 100644 --- a/drivers/gpu/drm/amd/amdgpu/si_dma.c +++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c @@ -21,7 +21,7 @@ * * Authors: Alex Deucher */ -#include <drm/drmP.h> + #include "amdgpu.h" #include "amdgpu_trace.h" #include "si.h" @@ -230,7 +230,7 @@ static int si_dma_ring_test_ring(struct amdgpu_ring *ring) tmp = le32_to_cpu(adev->wb.wb[index]); if (tmp == 0xDEADBEEF) break; - DRM_UDELAY(1); + udelay(1); } if (i >= adev->usec_timeout) |
