diff options
author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2019-08-23 11:35:39 +0200 |
---|---|---|
committer | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2019-08-23 11:35:39 +0200 |
commit | 6f50fa2a6f1395ad5f59ce7b87730f1f3ea19d76 (patch) | |
tree | f826145c5bf9c502c033e7b67bcefc30eb0f9eee /drivers/gpu/drm/amd/amdgpu/cik_sdma.c | |
parent | 5b6cc1277a0536dae20f37d531f29b3416cee670 (diff) | |
parent | 15d90b242290f228166ea79ee1cc2db6b31a2143 (diff) | |
download | talos-op-linux-6f50fa2a6f1395ad5f59ce7b87730f1f3ea19d76.tar.gz talos-op-linux-6f50fa2a6f1395ad5f59ce7b87730f1f3ea19d76.zip |
Merge branch 'master' into for-5.4/logitech
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
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) |