diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2019-07-31 10:45:52 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-07-31 14:33:36 -0500 |
| commit | 9a2ffeb525a1c6f4e25afe0598a10ec43731cb6e (patch) | |
| tree | 30b9f24319da2b22add1da99023d41066e2d171f /drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | |
| parent | 75589f496d6d3f13e8e2da6c32a93b6b7902d4ad (diff) | |
| download | linux-9a2ffeb525a1c6f4e25afe0598a10ec43731cb6e.tar.gz linux-9a2ffeb525a1c6f4e25afe0598a10ec43731cb6e.tar.bz2 linux-9a2ffeb525a1c6f4e25afe0598a10ec43731cb6e.zip | |
drm/amdgpu: drop drmP.h from vcn_v2_0.c
And fix the fallout.
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c index eef3ec5449af..36ad0c0e8efb 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c @@ -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) |