diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-08-11 23:24:46 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-08-11 23:24:46 -0700 |
| commit | 4aa31b4b61e4985e719352c329c3948d1932cb64 (patch) | |
| tree | 251d6d11d1e5c9c09adc3e0eb1715c56b2e16c95 /drivers/gpu/drm/amd/amdgpu/cik_sdma.c | |
| parent | Input: remove w90x900 touchscreen driver (diff) | |
| parent | Linux 5.3-rc4 (diff) | |
| download | linux-dev-4aa31b4b61e4985e719352c329c3948d1932cb64.tar.xz linux-dev-4aa31b4b61e4985e719352c329c3948d1932cb64.zip | |
Merge tag 'v5.3-rc4' into next
Sync up with mainline to bring in device_property_count_u32 andother
newer APIs.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/cik_sdma.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c index d42808b05971..c45304f1047c 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c @@ -21,8 +21,10 @@ * * Authors: Alex Deucher */ + #include <linux/firmware.h> -#include <drm/drmP.h> +#include <linux/module.h> + #include "amdgpu.h" #include "amdgpu_ucode.h" #include "amdgpu_trace.h" @@ -640,7 +642,7 @@ static int cik_sdma_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) |