diff options
| author |   Sam Ravnborg <sam@ravnborg.org> | 2019-06-10 00:07:49 +0200 |
|---|---|---|
| committer | Sam Ravnborg <sam@ravnborg.org> | 2019-06-10 22:59:32 +0200 |
| commit | c366be543c5ea35f4d4103f5ee69f052ce2bffe1 (patch) | |
| tree | cb6ced2f7f2a6e923d93020c28e9f74d2c25df28 /drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | |
| parent | drm: fix build errors with drm_print.h (diff) | |
| download | linux-dev-c366be543c5ea35f4d4103f5ee69f052ce2bffe1.tar.xz linux-dev-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 <sam@ravnborg.org>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190609220757.10862-3-sam@ravnborg.org
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c index ba67d1023264..f35c1122f12b 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c @@ -20,8 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. * */ + +#include <linux/delay.h> #include <linux/kernel.h> #include <linux/firmware.h> + #include <drm/drmP.h> #include "amdgpu.h" #include "amdgpu_gfx.h" @@ -417,7 +420,7 @@ static int gfx_v9_0_ring_test_ring(struct amdgpu_ring *ring) tmp = RREG32(scratch); if (tmp == 0xDEADBEEF) break; - DRM_UDELAY(1); + udelay(1); } if (i >= adev->usec_timeout) |