diff options
| author | Sam Ravnborg <[email protected]> | 2019-06-09 22:07:49 +0000 |
|---|---|---|
| committer | Sam Ravnborg <[email protected]> | 2019-06-10 20:59:32 +0000 |
| commit | c366be543c5ea35f4d4103f5ee69f052ce2bffe1 (patch) | |
| tree | cb6ced2f7f2a6e923d93020c28e9f74d2c25df28 /drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | |
| parent | drm: fix build errors with drm_print.h (diff) | |
| download | kernel-c366be543c5ea35f4d4103f5ee69f052ce2bffe1.tar.gz kernel-c366be543c5ea35f4d4103f5ee69f052ce2bffe1.zip | |
drm/amd: drop dependencies on drm_os_linux.h
Fix so no files in drm/amd/ depends on the
deprecated drm_os_linux.h header file.
It was done manually:
- remove drm_os_linux.h from drmP.h
- fix all build errros
Signed-off-by: Sam Ravnborg <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: "David (ChunMing) Zhou" <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c index 36196372e8db..bd7c8f5cd0e7 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c @@ -21,7 +21,10 @@ * * Authors: Alex Deucher */ + +#include <linux/delay.h> #include <linux/firmware.h> + #include <drm/drmP.h> #include "amdgpu.h" #include "amdgpu_ucode.h" @@ -574,7 +577,7 @@ static int sdma_v2_4_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) |