]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amdgpu: drop drmP.h from sdma_v5_0.c
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 31 Jul 2019 15:43:40 +0000 (10:43 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 31 Jul 2019 19:33:31 +0000 (14:33 -0500)
And fix the fallout.

Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c

index 3e536140bfd6d548790d8ab2315c8b5850e09068..aa43dc6c599aa1997bd98216934d414a9a6db3f7 100644 (file)
  *
  */
 
+#include <linux/delay.h>
 #include <linux/firmware.h>
-#include <drm/drmP.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+
 #include "amdgpu.h"
 #include "amdgpu_ucode.h"
 #include "amdgpu_trace.h"
@@ -882,7 +885,7 @@ static int sdma_v5_0_ring_test_ring(struct amdgpu_ring *ring)
                if (amdgpu_emu_mode == 1)
                        msleep(1);
                else
-                       DRM_UDELAY(1);
+                       udelay(1);
        }
 
        if (i < adev->usec_timeout) {
@@ -1337,7 +1340,7 @@ static int sdma_v5_0_ring_preempt_ib(struct amdgpu_ring *ring)
                if (ring->trail_seq ==
                    le32_to_cpu(*(ring->trail_fence_cpu_addr)))
                        break;
-               DRM_UDELAY(1);
+               udelay(1);
        }
 
        if (i >= adev->usec_timeout) {