diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2019-07-31 10:43:40 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-07-31 14:33:31 -0500 |
| commit | 75589f496d6d3f13e8e2da6c32a93b6b7902d4ad (patch) | |
| tree | 7876be7848f035f8e295051bb7934b6402e9424f | |
| parent | e9eea90247fef9070e72b6a010535681c825c117 (diff) | |
| download | linux-75589f496d6d3f13e8e2da6c32a93b6b7902d4ad.tar.gz linux-75589f496d6d3f13e8e2da6c32a93b6b7902d4ad.tar.bz2 linux-75589f496d6d3f13e8e2da6c32a93b6b7902d4ad.zip | |
drm/amdgpu: drop drmP.h from sdma_v5_0.c
And fix the fallout.
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c index 3e536140bfd6..aa43dc6c599a 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c @@ -21,8 +21,11 @@ * */ +#include <linux/delay.h> #include <linux/firmware.h> -#include <drm/drmP.h> +#include <linux/module.h> +#include <linux/pci.h> + #include "amdgpu.h" #include "amdgpu_ucode.h" #include "amdgpu_trace.h" @@ -882,7 +885,7 @@ static int sdma_v5_0_ring_test_ring(struct amdgpu_ring *ring) if (amdgpu_emu_mode == 1) msleep(1); else - DRM_UDELAY(1); + udelay(1); } if (i < adev->usec_timeout) { @@ -1337,7 +1340,7 @@ static int sdma_v5_0_ring_preempt_ib(struct amdgpu_ring *ring) if (ring->trail_seq == le32_to_cpu(*(ring->trail_fence_cpu_addr))) break; - DRM_UDELAY(1); + udelay(1); } if (i >= adev->usec_timeout) { |