diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2019-06-09 18:07:49 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2019-06-10 16:59:32 -0400 |
commit | c366be543c5ea35f4d4103f5ee69f052ce2bffe1 (patch) | |
tree | cb6ced2f7f2a6e923d93020c28e9f74d2c25df28 | |
parent | 656600efd67b9b185bc1c85ec68d9420c2bbb812 (diff) |
drm/amd: drop dependencies on drm_os_linux.h
Fix so no files in drm/amd/ depends on the
deprecated drm_os_linux.h header file.
It was done manually:
- remove drm_os_linux.h from drmP.h
- fix all build errros
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190609220757.10862-3-sam@ravnborg.org
36 files changed, 90 insertions, 28 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c index a6e5184d436c..d2b51bc3f534 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | |||
@@ -22,10 +22,12 @@ | |||
22 | 22 | ||
23 | #define pr_fmt(fmt) "kfd2kgd: " fmt | 23 | #define pr_fmt(fmt) "kfd2kgd: " fmt |
24 | 24 | ||
25 | #include <linux/dma-buf.h> | ||
25 | #include <linux/list.h> | 26 | #include <linux/list.h> |
26 | #include <linux/pagemap.h> | 27 | #include <linux/pagemap.h> |
27 | #include <linux/sched/mm.h> | 28 | #include <linux/sched/mm.h> |
28 | #include <linux/dma-buf.h> | 29 | #include <linux/sched/task.h> |
30 | |||
29 | #include <drm/drmP.h> | 31 | #include <drm/drmP.h> |
30 | #include "amdgpu_object.h" | 32 | #include "amdgpu_object.h" |
31 | #include "amdgpu_vm.h" | 33 | #include "amdgpu_vm.h" |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c index 250d9212cc38..924d83e711ef 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | |||
@@ -24,6 +24,8 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include <linux/io-64-nonatomic-lo-hi.h> | ||
28 | |||
27 | #include "amdgpu.h" | 29 | #include "amdgpu.h" |
28 | 30 | ||
29 | /** | 31 | /** |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 0c52d1f9fe0f..e9ede34dd875 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |||
@@ -29,6 +29,16 @@ | |||
29 | * Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 29 | * Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> |
30 | * Dave Airlie | 30 | * Dave Airlie |
31 | */ | 31 | */ |
32 | |||
33 | #include <linux/debugfs.h> | ||
34 | #include <linux/iommu.h> | ||
35 | #include <linux/pagemap.h> | ||
36 | #include <linux/sched/task.h> | ||
37 | #include <linux/seq_file.h> | ||
38 | #include <linux/slab.h> | ||
39 | #include <linux/swap.h> | ||
40 | #include <linux/swiotlb.h> | ||
41 | |||
32 | #include <drm/ttm/ttm_bo_api.h> | 42 | #include <drm/ttm/ttm_bo_api.h> |
33 | #include <drm/ttm/ttm_bo_driver.h> | 43 | #include <drm/ttm/ttm_bo_driver.h> |
34 | #include <drm/ttm/ttm_placement.h> | 44 | #include <drm/ttm/ttm_placement.h> |
@@ -36,13 +46,6 @@ | |||
36 | #include <drm/ttm/ttm_page_alloc.h> | 46 | #include <drm/ttm/ttm_page_alloc.h> |
37 | #include <drm/drmP.h> | 47 | #include <drm/drmP.h> |
38 | #include <drm/amdgpu_drm.h> | 48 | #include <drm/amdgpu_drm.h> |
39 | #include <linux/seq_file.h> | ||
40 | #include <linux/slab.h> | ||
41 | #include <linux/swiotlb.h> | ||
42 | #include <linux/swap.h> | ||
43 | #include <linux/pagemap.h> | ||
44 | #include <linux/debugfs.h> | ||
45 | #include <linux/iommu.h> | ||
46 | #include "amdgpu.h" | 49 | #include "amdgpu.h" |
47 | #include "amdgpu_object.h" | 50 | #include "amdgpu_object.h" |
48 | #include "amdgpu_trace.h" | 51 | #include "amdgpu_trace.h" |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c index c021b114c8a4..fa03081c2f78 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | |||
@@ -1090,7 +1090,7 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring) | |||
1090 | for (i = 0; i < timeout; i++) { | 1090 | for (i = 0; i < timeout; i++) { |
1091 | if (amdgpu_ring_get_rptr(ring) != rptr) | 1091 | if (amdgpu_ring_get_rptr(ring) != rptr) |
1092 | break; | 1092 | break; |
1093 | DRM_UDELAY(1); | 1093 | udelay(1); |
1094 | } | 1094 | } |
1095 | 1095 | ||
1096 | if (i >= timeout) | 1096 | if (i >= timeout) |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c index ecf6f96df2ad..7ed5d4e3884d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | |||
@@ -446,7 +446,7 @@ int amdgpu_vcn_dec_ring_test_ring(struct amdgpu_ring *ring) | |||
446 | tmp = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9)); | 446 | tmp = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9)); |
447 | if (tmp == 0xDEADBEEF) | 447 | if (tmp == 0xDEADBEEF) |
448 | break; | 448 | break; |
449 | DRM_UDELAY(1); | 449 | udelay(1); |
450 | } | 450 | } |
451 | 451 | ||
452 | if (i >= adev->usec_timeout) | 452 | if (i >= adev->usec_timeout) |
@@ -608,7 +608,7 @@ int amdgpu_vcn_enc_ring_test_ring(struct amdgpu_ring *ring) | |||
608 | for (i = 0; i < adev->usec_timeout; i++) { | 608 | for (i = 0; i < adev->usec_timeout; i++) { |
609 | if (amdgpu_ring_get_rptr(ring) != rptr) | 609 | if (amdgpu_ring_get_rptr(ring) != rptr) |
610 | break; | 610 | break; |
611 | DRM_UDELAY(1); | 611 | udelay(1); |
612 | } | 612 | } |
613 | 613 | ||
614 | if (i >= adev->usec_timeout) | 614 | if (i >= adev->usec_timeout) |
@@ -767,7 +767,7 @@ int amdgpu_vcn_jpeg_ring_test_ring(struct amdgpu_ring *ring) | |||
767 | tmp = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9)); | 767 | tmp = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9)); |
768 | if (tmp == 0xDEADBEEF) | 768 | if (tmp == 0xDEADBEEF) |
769 | break; | 769 | break; |
770 | DRM_UDELAY(1); | 770 | udelay(1); |
771 | } | 771 | } |
772 | 772 | ||
773 | if (i >= adev->usec_timeout) | 773 | if (i >= adev->usec_timeout) |
@@ -841,7 +841,7 @@ int amdgpu_vcn_jpeg_ring_test_ib(struct amdgpu_ring *ring, long timeout) | |||
841 | tmp = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9)); | 841 | tmp = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9)); |
842 | if (tmp == 0xDEADBEEF) | 842 | if (tmp == 0xDEADBEEF) |
843 | break; | 843 | break; |
844 | DRM_UDELAY(1); | 844 | udelay(1); |
845 | } | 845 | } |
846 | 846 | ||
847 | if (i >= adev->usec_timeout) | 847 | if (i >= adev->usec_timeout) |
diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c index d42808b05971..063057ca18be 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c | |||
@@ -640,7 +640,7 @@ static int cik_sdma_ring_test_ring(struct amdgpu_ring *ring) | |||
640 | tmp = le32_to_cpu(adev->wb.wb[index]); | 640 | tmp = le32_to_cpu(adev->wb.wb[index]); |
641 | if (tmp == 0xDEADBEEF) | 641 | if (tmp == 0xDEADBEEF) |
642 | break; | 642 | break; |
643 | DRM_UDELAY(1); | 643 | udelay(1); |
644 | } | 644 | } |
645 | 645 | ||
646 | if (i >= adev->usec_timeout) | 646 | if (i >= adev->usec_timeout) |
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c index c0cb244f58cd..4f761ebb655e 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | |||
@@ -1812,7 +1812,7 @@ static int gfx_v6_0_ring_test_ring(struct amdgpu_ring *ring) | |||
1812 | tmp = RREG32(scratch); | 1812 | tmp = RREG32(scratch); |
1813 | if (tmp == 0xDEADBEEF) | 1813 | if (tmp == 0xDEADBEEF) |
1814 | break; | 1814 | break; |
1815 | DRM_UDELAY(1); | 1815 | udelay(1); |
1816 | } | 1816 | } |
1817 | 1817 | ||
1818 | if (i >= adev->usec_timeout) | 1818 | if (i >= adev->usec_timeout) |
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c index a59e0fdf5a97..a61325ede1f8 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | |||
@@ -2080,7 +2080,7 @@ static int gfx_v7_0_ring_test_ring(struct amdgpu_ring *ring) | |||
2080 | tmp = RREG32(scratch); | 2080 | tmp = RREG32(scratch); |
2081 | if (tmp == 0xDEADBEEF) | 2081 | if (tmp == 0xDEADBEEF) |
2082 | break; | 2082 | break; |
2083 | DRM_UDELAY(1); | 2083 | udelay(1); |
2084 | } | 2084 | } |
2085 | if (i >= adev->usec_timeout) | 2085 | if (i >= adev->usec_timeout) |
2086 | r = -ETIMEDOUT; | 2086 | r = -ETIMEDOUT; |
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c index 02955e6e9dd9..775f6bd4fff6 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | |||
@@ -20,8 +20,11 @@ | |||
20 | * OTHER DEALINGS IN THE SOFTWARE. | 20 | * OTHER DEALINGS IN THE SOFTWARE. |
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | |||
24 | #include <linux/delay.h> | ||
23 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
24 | #include <linux/firmware.h> | 26 | #include <linux/firmware.h> |
27 | |||
25 | #include <drm/drmP.h> | 28 | #include <drm/drmP.h> |
26 | #include "amdgpu.h" | 29 | #include "amdgpu.h" |
27 | #include "amdgpu_gfx.h" | 30 | #include "amdgpu_gfx.h" |
@@ -855,7 +858,7 @@ static int gfx_v8_0_ring_test_ring(struct amdgpu_ring *ring) | |||
855 | tmp = RREG32(scratch); | 858 | tmp = RREG32(scratch); |
856 | if (tmp == 0xDEADBEEF) | 859 | if (tmp == 0xDEADBEEF) |
857 | break; | 860 | break; |
858 | DRM_UDELAY(1); | 861 | udelay(1); |
859 | } | 862 | } |
860 | 863 | ||
861 | if (i >= adev->usec_timeout) | 864 | if (i >= adev->usec_timeout) |
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c index ba67d1023264..f35c1122f12b 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | |||
@@ -20,8 +20,11 @@ | |||
20 | * OTHER DEALINGS IN THE SOFTWARE. | 20 | * OTHER DEALINGS IN THE SOFTWARE. |
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | |||
24 | #include <linux/delay.h> | ||
23 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
24 | #include <linux/firmware.h> | 26 | #include <linux/firmware.h> |
27 | |||
25 | #include <drm/drmP.h> | 28 | #include <drm/drmP.h> |
26 | #include "amdgpu.h" | 29 | #include "amdgpu.h" |
27 | #include "amdgpu_gfx.h" | 30 | #include "amdgpu_gfx.h" |
@@ -417,7 +420,7 @@ static int gfx_v9_0_ring_test_ring(struct amdgpu_ring *ring) | |||
417 | tmp = RREG32(scratch); | 420 | tmp = RREG32(scratch); |
418 | if (tmp == 0xDEADBEEF) | 421 | if (tmp == 0xDEADBEEF) |
419 | break; | 422 | break; |
420 | DRM_UDELAY(1); | 423 | udelay(1); |
421 | } | 424 | } |
422 | 425 | ||
423 | if (i >= adev->usec_timeout) | 426 | if (i >= adev->usec_timeout) |
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c index 36196372e8db..bd7c8f5cd0e7 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | |||
@@ -21,7 +21,10 @@ | |||
21 | * | 21 | * |
22 | * Authors: Alex Deucher | 22 | * Authors: Alex Deucher |
23 | */ | 23 | */ |
24 | |||
25 | #include <linux/delay.h> | ||
24 | #include <linux/firmware.h> | 26 | #include <linux/firmware.h> |
27 | |||
25 | #include <drm/drmP.h> | 28 | #include <drm/drmP.h> |
26 | #include "amdgpu.h" | 29 | #include "amdgpu.h" |
27 | #include "amdgpu_ucode.h" | 30 | #include "amdgpu_ucode.h" |
@@ -574,7 +577,7 @@ static int sdma_v2_4_ring_test_ring(struct amdgpu_ring *ring) | |||
574 | tmp = le32_to_cpu(adev->wb.wb[index]); | 577 | tmp = le32_to_cpu(adev->wb.wb[index]); |
575 | if (tmp == 0xDEADBEEF) | 578 | if (tmp == 0xDEADBEEF) |
576 | break; | 579 | break; |
577 | DRM_UDELAY(1); | 580 | udelay(1); |
578 | } | 581 | } |
579 | 582 | ||
580 | if (i >= adev->usec_timeout) | 583 | if (i >= adev->usec_timeout) |
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c index 6d39544e7829..346e1910641d 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | |||
@@ -21,7 +21,10 @@ | |||
21 | * | 21 | * |
22 | * Authors: Alex Deucher | 22 | * Authors: Alex Deucher |
23 | */ | 23 | */ |
24 | |||
25 | #include <linux/delay.h> | ||
24 | #include <linux/firmware.h> | 26 | #include <linux/firmware.h> |
27 | |||
25 | #include <drm/drmP.h> | 28 | #include <drm/drmP.h> |
26 | #include "amdgpu.h" | 29 | #include "amdgpu.h" |
27 | #include "amdgpu_ucode.h" | 30 | #include "amdgpu_ucode.h" |
@@ -846,7 +849,7 @@ static int sdma_v3_0_ring_test_ring(struct amdgpu_ring *ring) | |||
846 | tmp = le32_to_cpu(adev->wb.wb[index]); | 849 | tmp = le32_to_cpu(adev->wb.wb[index]); |
847 | if (tmp == 0xDEADBEEF) | 850 | if (tmp == 0xDEADBEEF) |
848 | break; | 851 | break; |
849 | DRM_UDELAY(1); | 852 | udelay(1); |
850 | } | 853 | } |
851 | 854 | ||
852 | if (i >= adev->usec_timeout) | 855 | if (i >= adev->usec_timeout) |
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c index 9c88ce513d78..08e0f81b87b5 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | |||
@@ -22,6 +22,8 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <linux/firmware.h> | 24 | #include <linux/firmware.h> |
25 | #include <linux/delay.h> | ||
26 | |||
25 | #include <drm/drmP.h> | 27 | #include <drm/drmP.h> |
26 | #include "amdgpu.h" | 28 | #include "amdgpu.h" |
27 | #include "amdgpu_ucode.h" | 29 | #include "amdgpu_ucode.h" |
@@ -1207,7 +1209,7 @@ static int sdma_v4_0_ring_test_ring(struct amdgpu_ring *ring) | |||
1207 | tmp = le32_to_cpu(adev->wb.wb[index]); | 1209 | tmp = le32_to_cpu(adev->wb.wb[index]); |
1208 | if (tmp == 0xDEADBEEF) | 1210 | if (tmp == 0xDEADBEEF) |
1209 | break; | 1211 | break; |
1210 | DRM_UDELAY(1); | 1212 | udelay(1); |
1211 | } | 1213 | } |
1212 | 1214 | ||
1213 | if (i >= adev->usec_timeout) | 1215 | if (i >= adev->usec_timeout) |
diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdgpu/si_dma.c index 3eeefd40dae0..1108eb66277d 100644 --- a/drivers/gpu/drm/amd/amdgpu/si_dma.c +++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c | |||
@@ -230,7 +230,7 @@ static int si_dma_ring_test_ring(struct amdgpu_ring *ring) | |||
230 | tmp = le32_to_cpu(adev->wb.wb[index]); | 230 | tmp = le32_to_cpu(adev->wb.wb[index]); |
231 | if (tmp == 0xDEADBEEF) | 231 | if (tmp == 0xDEADBEEF) |
232 | break; | 232 | break; |
233 | DRM_UDELAY(1); | 233 | udelay(1); |
234 | } | 234 | } |
235 | 235 | ||
236 | if (i >= adev->usec_timeout) | 236 | if (i >= adev->usec_timeout) |
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c index c4fb58667fd4..037606a5f185 100644 --- a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | |||
@@ -491,7 +491,7 @@ static int uvd_v4_2_ring_test_ring(struct amdgpu_ring *ring) | |||
491 | tmp = RREG32(mmUVD_CONTEXT_ID); | 491 | tmp = RREG32(mmUVD_CONTEXT_ID); |
492 | if (tmp == 0xDEADBEEF) | 492 | if (tmp == 0xDEADBEEF) |
493 | break; | 493 | break; |
494 | DRM_UDELAY(1); | 494 | udelay(1); |
495 | } | 495 | } |
496 | 496 | ||
497 | if (i >= adev->usec_timeout) | 497 | if (i >= adev->usec_timeout) |
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c index 52bd8a654734..c88aa2d6a2b5 100644 --- a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | |||
@@ -22,7 +22,9 @@ | |||
22 | * Authors: Christian König <christian.koenig@amd.com> | 22 | * Authors: Christian König <christian.koenig@amd.com> |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <linux/delay.h> | ||
25 | #include <linux/firmware.h> | 26 | #include <linux/firmware.h> |
27 | |||
26 | #include <drm/drmP.h> | 28 | #include <drm/drmP.h> |
27 | #include "amdgpu.h" | 29 | #include "amdgpu.h" |
28 | #include "amdgpu_uvd.h" | 30 | #include "amdgpu_uvd.h" |
@@ -506,7 +508,7 @@ static int uvd_v5_0_ring_test_ring(struct amdgpu_ring *ring) | |||
506 | tmp = RREG32(mmUVD_CONTEXT_ID); | 508 | tmp = RREG32(mmUVD_CONTEXT_ID); |
507 | if (tmp == 0xDEADBEEF) | 509 | if (tmp == 0xDEADBEEF) |
508 | break; | 510 | break; |
509 | DRM_UDELAY(1); | 511 | udelay(1); |
510 | } | 512 | } |
511 | 513 | ||
512 | if (i >= adev->usec_timeout) | 514 | if (i >= adev->usec_timeout) |
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c index c9edddf9f88a..50af37d08b91 100644 --- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | |||
@@ -183,7 +183,7 @@ static int uvd_v6_0_enc_ring_test_ring(struct amdgpu_ring *ring) | |||
183 | for (i = 0; i < adev->usec_timeout; i++) { | 183 | for (i = 0; i < adev->usec_timeout; i++) { |
184 | if (amdgpu_ring_get_rptr(ring) != rptr) | 184 | if (amdgpu_ring_get_rptr(ring) != rptr) |
185 | break; | 185 | break; |
186 | DRM_UDELAY(1); | 186 | udelay(1); |
187 | } | 187 | } |
188 | 188 | ||
189 | if (i >= adev->usec_timeout) | 189 | if (i >= adev->usec_timeout) |
@@ -957,7 +957,7 @@ static int uvd_v6_0_ring_test_ring(struct amdgpu_ring *ring) | |||
957 | tmp = RREG32(mmUVD_CONTEXT_ID); | 957 | tmp = RREG32(mmUVD_CONTEXT_ID); |
958 | if (tmp == 0xDEADBEEF) | 958 | if (tmp == 0xDEADBEEF) |
959 | break; | 959 | break; |
960 | DRM_UDELAY(1); | 960 | udelay(1); |
961 | } | 961 | } |
962 | 962 | ||
963 | if (i >= adev->usec_timeout) | 963 | if (i >= adev->usec_timeout) |
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c index 2191d3d0a219..e36b69945ea2 100644 --- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | |||
@@ -191,7 +191,7 @@ static int uvd_v7_0_enc_ring_test_ring(struct amdgpu_ring *ring) | |||
191 | for (i = 0; i < adev->usec_timeout; i++) { | 191 | for (i = 0; i < adev->usec_timeout; i++) { |
192 | if (amdgpu_ring_get_rptr(ring) != rptr) | 192 | if (amdgpu_ring_get_rptr(ring) != rptr) |
193 | break; | 193 | break; |
194 | DRM_UDELAY(1); | 194 | udelay(1); |
195 | } | 195 | } |
196 | 196 | ||
197 | if (i >= adev->usec_timeout) | 197 | if (i >= adev->usec_timeout) |
@@ -1227,7 +1227,7 @@ static int uvd_v7_0_ring_test_ring(struct amdgpu_ring *ring) | |||
1227 | tmp = RREG32_SOC15(UVD, ring->me, mmUVD_CONTEXT_ID); | 1227 | tmp = RREG32_SOC15(UVD, ring->me, mmUVD_CONTEXT_ID); |
1228 | if (tmp == 0xDEADBEEF) | 1228 | if (tmp == 0xDEADBEEF) |
1229 | break; | 1229 | break; |
1230 | DRM_UDELAY(1); | 1230 | udelay(1); |
1231 | } | 1231 | } |
1232 | 1232 | ||
1233 | if (i >= adev->usec_timeout) | 1233 | if (i >= adev->usec_timeout) |
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c index 83d121510ef5..9b01078d6ec5 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | |||
@@ -23,6 +23,8 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/delay.h> | ||
27 | |||
26 | #include "dm_services.h" | 28 | #include "dm_services.h" |
27 | #include "core_types.h" | 29 | #include "core_types.h" |
28 | #include "timing_generator.h" | 30 | #include "timing_generator.h" |
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c index 96e97d25d639..1dc3492f02a1 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c | |||
@@ -23,6 +23,8 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/delay.h> | ||
27 | |||
26 | #include "dm_services.h" | 28 | #include "dm_services.h" |
27 | #include "dc.h" | 29 | #include "dc.h" |
28 | #include "core_types.h" | 30 | #include "core_types.h" |
diff --git a/drivers/gpu/drm/amd/display/dc/dc_helper.c b/drivers/gpu/drm/amd/display/dc/dc_helper.c index 5e6c5eff49cf..eb2d01d1a678 100644 --- a/drivers/gpu/drm/amd/display/dc/dc_helper.c +++ b/drivers/gpu/drm/amd/display/dc/dc_helper.c | |||
@@ -26,6 +26,9 @@ | |||
26 | * Created on: Aug 30, 2016 | 26 | * Created on: Aug 30, 2016 |
27 | * Author: agrodzov | 27 | * Author: agrodzov |
28 | */ | 28 | */ |
29 | |||
30 | #include <linux/delay.h> | ||
31 | |||
29 | #include "dm_services.h" | 32 | #include "dm_services.h" |
30 | #include <stdarg.h> | 33 | #include <stdarg.h> |
31 | 34 | ||
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c index bd33c47183fc..0863719b0c85 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | |||
@@ -23,6 +23,8 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/delay.h> | ||
27 | |||
26 | #include "dm_services.h" | 28 | #include "dm_services.h" |
27 | #include "core_types.h" | 29 | #include "core_types.h" |
28 | #include "dce_aux.h" | 30 | #include "dce_aux.h" |
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c b/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c index 818536eea00a..a8c2cf260c84 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | |||
@@ -23,6 +23,8 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/delay.h> | ||
27 | |||
26 | #include "core_types.h" | 28 | #include "core_types.h" |
27 | #include "link_encoder.h" | 29 | #include "link_encoder.h" |
28 | #include "dce_dmcu.h" | 30 | #include "dce_dmcu.h" |
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c b/drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c index cd26161bcc4d..8a236d40d8d0 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | |||
@@ -22,6 +22,9 @@ | |||
22 | * Authors: AMD | 22 | * Authors: AMD |
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | |||
26 | #include <linux/delay.h> | ||
27 | |||
25 | #include "dce_i2c.h" | 28 | #include "dce_i2c.h" |
26 | #include "dce_i2c_hw.h" | 29 | #include "dce_i2c_hw.h" |
27 | #include "reg_helper.h" | 30 | #include "reg_helper.h" |
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c b/drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c index f0266694cb56..a5a11c251e25 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c | |||
@@ -22,6 +22,9 @@ | |||
22 | * Authors: AMD | 22 | * Authors: AMD |
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | |||
26 | #include <linux/delay.h> | ||
27 | |||
25 | #include "dce_i2c.h" | 28 | #include "dce_i2c.h" |
26 | #include "dce_i2c_sw.h" | 29 | #include "dce_i2c_sw.h" |
27 | #include "include/gpio_service_interface.h" | 30 | #include "include/gpio_service_interface.h" |
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c index 314c04a915d2..1037d2a72f3f 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c | |||
@@ -23,6 +23,8 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/delay.h> | ||
27 | |||
26 | #include "reg_helper.h" | 28 | #include "reg_helper.h" |
27 | 29 | ||
28 | #include "core_types.h" | 30 | #include "core_types.h" |
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c index 14309fe6f2e6..0c0b41d70f65 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c | |||
@@ -23,6 +23,8 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/delay.h> | ||
27 | |||
26 | #include "dc_bios_types.h" | 28 | #include "dc_bios_types.h" |
27 | #include "dce_stream_encoder.h" | 29 | #include "dce_stream_encoder.h" |
28 | #include "reg_helper.h" | 30 | #include "reg_helper.h" |
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c index 7b23239d33fe..12083bb8ef02 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c | |||
@@ -23,6 +23,8 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/delay.h> | ||
27 | |||
26 | #include "dm_services.h" | 28 | #include "dm_services.h" |
27 | 29 | ||
28 | #include "dce/dce_11_0_d.h" | 30 | #include "dce/dce_11_0_d.h" |
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c index 7ac50ab1b762..54c266e84416 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | |||
@@ -22,6 +22,9 @@ | |||
22 | * Authors: AMD | 22 | * Authors: AMD |
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | |||
26 | #include <linux/delay.h> | ||
27 | |||
25 | #include "dm_services.h" | 28 | #include "dm_services.h" |
26 | #include "dc.h" | 29 | #include "dc.h" |
27 | #include "dc_bios_types.h" | 30 | #include "dc_bios_types.h" |
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_regamma_v.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_regamma_v.c index 9b65b77e8823..34c5e3c7c6d2 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_regamma_v.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_regamma_v.c | |||
@@ -23,6 +23,8 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/delay.h> | ||
27 | |||
26 | #include "dm_services.h" | 28 | #include "dm_services.h" |
27 | 29 | ||
28 | /* include DCE11 register header files */ | 30 | /* include DCE11 register header files */ |
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_transform_v.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_transform_v.c index aa8d6b10d2c3..b1aaab5590cc 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_transform_v.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_transform_v.c | |||
@@ -23,6 +23,8 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/delay.h> | ||
27 | |||
26 | #include "dce110_transform_v.h" | 28 | #include "dce110_transform_v.h" |
27 | #include "dm_services.h" | 29 | #include "dm_services.h" |
28 | #include "dc.h" | 30 | #include "dc.h" |
diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c index faae12cf7968..f9819df1d3e2 100644 --- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c +++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c | |||
@@ -23,6 +23,8 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/delay.h> | ||
27 | |||
26 | #include "dm_services.h" | 28 | #include "dm_services.h" |
27 | 29 | ||
28 | #include "dce/dce_11_2_d.h" | 30 | #include "dce/dce_11_2_d.h" |
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c index 0db2a6e96fc0..3d31dadfa012 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | |||
@@ -23,6 +23,8 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/delay.h> | ||
27 | |||
26 | #include "dm_services.h" | 28 | #include "dm_services.h" |
27 | #include "dcn10_hubp.h" | 29 | #include "dcn10_hubp.h" |
28 | #include "dcn10_hubbub.h" | 30 | #include "dcn10_hubbub.h" |
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c index 0126a44ba012..102d968a8cd3 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c | |||
@@ -23,6 +23,8 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/delay.h> | ||
27 | |||
26 | #include "reg_helper.h" | 28 | #include "reg_helper.h" |
27 | 29 | ||
28 | #include "core_types.h" | 30 | #include "core_types.h" |
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c index 8ee9f6dc1d62..c33153d696ac 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c | |||
@@ -23,6 +23,7 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/delay.h> | ||
26 | 27 | ||
27 | #include "dc_bios_types.h" | 28 | #include "dc_bios_types.h" |
28 | #include "dcn10_stream_encoder.h" | 29 | #include "dcn10_stream_encoder.h" |
diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c b/drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c index 310f48965b27..8ebeabad7bb7 100644 --- a/drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c +++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | |||
@@ -23,6 +23,8 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/delay.h> | ||
27 | |||
26 | #include "dm_services.h" | 28 | #include "dm_services.h" |
27 | 29 | ||
28 | #include "include/gpio_types.h" | 30 | #include "include/gpio_types.h" |