UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amdgpu: drop drmP.h in gfx_v10_0.c 

And fix the fallout.

Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher 2019-07-31 10:31:44 -05:00
parent 3b90f6ecdf
commit 0a069bbe13
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
View File

@ -20,8 +20,12 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
* *
*/ */
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/firmware.h> #include <linux/firmware.h>
#include <drm/drmP.h> #include <linux/module.h>
#include <linux/pci.h>
#include "amdgpu.h" #include "amdgpu.h"
#include "amdgpu_gfx.h" #include "amdgpu_gfx.h"
#include "amdgpu_psp.h" #include "amdgpu_psp.h"
@ -393,7 +397,7 @@ static int gfx_v10_0_ring_test_ring(struct amdgpu_ring *ring)
if (amdgpu_emu_mode == 1) if (amdgpu_emu_mode == 1)
msleep(1); msleep(1);
else else
DRM_UDELAY(1); udelay(1);
} }
if (i < adev->usec_timeout) { if (i < adev->usec_timeout) {
if (amdgpu_emu_mode == 1) if (amdgpu_emu_mode == 1)
@ -4551,7 +4555,7 @@ static int gfx_v10_0_ring_preempt_ib(struct amdgpu_ring *ring)
if (ring->trail_seq == if (ring->trail_seq ==
le32_to_cpu(*(ring->trail_fence_cpu_addr))) le32_to_cpu(*(ring->trail_fence_cpu_addr)))
break; break;
DRM_UDELAY(1); udelay(1);
} }
if (i >= adev->usec_timeout) { if (i >= adev->usec_timeout) {