]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amdgpu: drop drmP.h from vcn_v2_0.c
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 31 Jul 2019 15:45:52 +0000 (10:45 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 31 Jul 2019 19:33:36 +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/vcn_v2_0.c

index eef3ec5449afa80536de7bad65da8c6261009f17..36ad0c0e8efbcb714fd0acc3ed3e261bbf0ab51b 100644 (file)
@@ -22,7 +22,7 @@
  */
 
 #include <linux/firmware.h>
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_vcn.h"
 #include "soc15.h"
@@ -2112,7 +2112,7 @@ static int vcn_v2_0_dec_ring_test_ring(struct amdgpu_ring *ring)
                tmp = RREG32(adev->vcn.inst[ring->me].external.scratch9);
                if (tmp == 0xDEADBEEF)
                        break;
-               DRM_UDELAY(1);
+               udelay(1);
        }
 
        if (i >= adev->usec_timeout)