Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+90 -28
+3 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
··· 22 22 23 23 #define pr_fmt(fmt) "kfd2kgd: " fmt 24 24 25 + #include <linux/dma-buf.h> 25 26 #include <linux/list.h> 26 27 #include <linux/pagemap.h> 27 28 #include <linux/sched/mm.h> 28 - #include <linux/dma-buf.h> 29 + #include <linux/sched/task.h> 30 + 29 31 #include <drm/drmP.h> 30 32 #include "amdgpu_object.h" 31 33 #include "amdgpu_vm.h"
+2
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
··· 24 24 * 25 25 */ 26 26 27 + #include <linux/io-64-nonatomic-lo-hi.h> 28 + 27 29 #include "amdgpu.h" 28 30 29 31 /**
+10 -7
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
··· 29 29 * Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> 30 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 42 #include <drm/ttm/ttm_bo_api.h> 33 43 #include <drm/ttm/ttm_bo_driver.h> 34 44 #include <drm/ttm/ttm_placement.h> ··· 46 36 #include <drm/ttm/ttm_page_alloc.h> 47 37 #include <drm/drmP.h> 48 38 #include <drm/amdgpu_drm.h> 49 - #include <linux/seq_file.h> 50 - #include <linux/slab.h> 51 - #include <linux/swiotlb.h> 52 - #include <linux/swap.h> 53 - #include <linux/pagemap.h> 54 - #include <linux/debugfs.h> 55 - #include <linux/iommu.h> 56 39 #include "amdgpu.h" 57 40 #include "amdgpu_object.h" 58 41 #include "amdgpu_trace.h"
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
··· 1090 1090 for (i = 0; i < timeout; i++) { 1091 1091 if (amdgpu_ring_get_rptr(ring) != rptr) 1092 1092 break; 1093 - DRM_UDELAY(1); 1093 + udelay(1); 1094 1094 } 1095 1095 1096 1096 if (i >= timeout)
+4 -4
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
··· 446 446 tmp = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9)); 447 447 if (tmp == 0xDEADBEEF) 448 448 break; 449 - DRM_UDELAY(1); 449 + udelay(1); 450 450 } 451 451 452 452 if (i >= adev->usec_timeout) ··· 608 608 for (i = 0; i < adev->usec_timeout; i++) { 609 609 if (amdgpu_ring_get_rptr(ring) != rptr) 610 610 break; 611 - DRM_UDELAY(1); 611 + udelay(1); 612 612 } 613 613 614 614 if (i >= adev->usec_timeout) ··· 767 767 tmp = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9)); 768 768 if (tmp == 0xDEADBEEF) 769 769 break; 770 - DRM_UDELAY(1); 770 + udelay(1); 771 771 } 772 772 773 773 if (i >= adev->usec_timeout) ··· 841 841 tmp = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9)); 842 842 if (tmp == 0xDEADBEEF) 843 843 break; 844 - DRM_UDELAY(1); 844 + udelay(1); 845 845 } 846 846 847 847 if (i >= adev->usec_timeout)
+1 -1
drivers/gpu/drm/amd/amdgpu/cik_sdma.c
··· 640 640 tmp = le32_to_cpu(adev->wb.wb[index]); 641 641 if (tmp == 0xDEADBEEF) 642 642 break; 643 - DRM_UDELAY(1); 643 + udelay(1); 644 644 } 645 645 646 646 if (i >= adev->usec_timeout)
+1 -1
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
··· 1812 1812 tmp = RREG32(scratch); 1813 1813 if (tmp == 0xDEADBEEF) 1814 1814 break; 1815 - DRM_UDELAY(1); 1815 + udelay(1); 1816 1816 } 1817 1817 1818 1818 if (i >= adev->usec_timeout)
+1 -1
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
··· 2080 2080 tmp = RREG32(scratch); 2081 2081 if (tmp == 0xDEADBEEF) 2082 2082 break; 2083 - DRM_UDELAY(1); 2083 + udelay(1); 2084 2084 } 2085 2085 if (i >= adev->usec_timeout) 2086 2086 r = -ETIMEDOUT;
+4 -1
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
··· 20 20 * OTHER DEALINGS IN THE SOFTWARE. 21 21 * 22 22 */ 23 + 24 + #include <linux/delay.h> 23 25 #include <linux/kernel.h> 24 26 #include <linux/firmware.h> 27 + 25 28 #include <drm/drmP.h> 26 29 #include "amdgpu.h" 27 30 #include "amdgpu_gfx.h" ··· 858 855 tmp = RREG32(scratch); 859 856 if (tmp == 0xDEADBEEF) 860 857 break; 861 - DRM_UDELAY(1); 858 + udelay(1); 862 859 } 863 860 864 861 if (i >= adev->usec_timeout)
+4 -1
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
··· 20 20 * OTHER DEALINGS IN THE SOFTWARE. 21 21 * 22 22 */ 23 + 24 + #include <linux/delay.h> 23 25 #include <linux/kernel.h> 24 26 #include <linux/firmware.h> 27 + 25 28 #include <drm/drmP.h> 26 29 #include "amdgpu.h" 27 30 #include "amdgpu_gfx.h" ··· 420 417 tmp = RREG32(scratch); 421 418 if (tmp == 0xDEADBEEF) 422 419 break; 423 - DRM_UDELAY(1); 420 + udelay(1); 424 421 } 425 422 426 423 if (i >= adev->usec_timeout)
+4 -1
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
··· 21 21 * 22 22 * Authors: Alex Deucher 23 23 */ 24 + 25 + #include <linux/delay.h> 24 26 #include <linux/firmware.h> 27 + 25 28 #include <drm/drmP.h> 26 29 #include "amdgpu.h" 27 30 #include "amdgpu_ucode.h" ··· 577 574 tmp = le32_to_cpu(adev->wb.wb[index]); 578 575 if (tmp == 0xDEADBEEF) 579 576 break; 580 - DRM_UDELAY(1); 577 + udelay(1); 581 578 } 582 579 583 580 if (i >= adev->usec_timeout)
+4 -1
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
··· 21 21 * 22 22 * Authors: Alex Deucher 23 23 */ 24 + 25 + #include <linux/delay.h> 24 26 #include <linux/firmware.h> 27 + 25 28 #include <drm/drmP.h> 26 29 #include "amdgpu.h" 27 30 #include "amdgpu_ucode.h" ··· 849 846 tmp = le32_to_cpu(adev->wb.wb[index]); 850 847 if (tmp == 0xDEADBEEF) 851 848 break; 852 - DRM_UDELAY(1); 849 + udelay(1); 853 850 } 854 851 855 852 if (i >= adev->usec_timeout)
+3 -1
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
··· 22 22 */ 23 23 24 24 #include <linux/firmware.h> 25 + #include <linux/delay.h> 26 + 25 27 #include <drm/drmP.h> 26 28 #include "amdgpu.h" 27 29 #include "amdgpu_ucode.h" ··· 1209 1207 tmp = le32_to_cpu(adev->wb.wb[index]); 1210 1208 if (tmp == 0xDEADBEEF) 1211 1209 break; 1212 - DRM_UDELAY(1); 1210 + udelay(1); 1213 1211 } 1214 1212 1215 1213 if (i >= adev->usec_timeout)
+1 -1
drivers/gpu/drm/amd/amdgpu/si_dma.c
··· 230 230 tmp = le32_to_cpu(adev->wb.wb[index]); 231 231 if (tmp == 0xDEADBEEF) 232 232 break; 233 - DRM_UDELAY(1); 233 + udelay(1); 234 234 } 235 235 236 236 if (i >= adev->usec_timeout)
+1 -1
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
··· 491 491 tmp = RREG32(mmUVD_CONTEXT_ID); 492 492 if (tmp == 0xDEADBEEF) 493 493 break; 494 - DRM_UDELAY(1); 494 + udelay(1); 495 495 } 496 496 497 497 if (i >= adev->usec_timeout)
+3 -1
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
··· 22 22 * Authors: Christian König <christian.koenig@amd.com> 23 23 */ 24 24 25 + #include <linux/delay.h> 25 26 #include <linux/firmware.h> 27 + 26 28 #include <drm/drmP.h> 27 29 #include "amdgpu.h" 28 30 #include "amdgpu_uvd.h" ··· 508 506 tmp = RREG32(mmUVD_CONTEXT_ID); 509 507 if (tmp == 0xDEADBEEF) 510 508 break; 511 - DRM_UDELAY(1); 509 + udelay(1); 512 510 } 513 511 514 512 if (i >= adev->usec_timeout)
+2 -2
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
··· 183 183 for (i = 0; i < adev->usec_timeout; i++) { 184 184 if (amdgpu_ring_get_rptr(ring) != rptr) 185 185 break; 186 - DRM_UDELAY(1); 186 + udelay(1); 187 187 } 188 188 189 189 if (i >= adev->usec_timeout) ··· 957 957 tmp = RREG32(mmUVD_CONTEXT_ID); 958 958 if (tmp == 0xDEADBEEF) 959 959 break; 960 - DRM_UDELAY(1); 960 + udelay(1); 961 961 } 962 962 963 963 if (i >= adev->usec_timeout)
+2 -2
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
··· 191 191 for (i = 0; i < adev->usec_timeout; i++) { 192 192 if (amdgpu_ring_get_rptr(ring) != rptr) 193 193 break; 194 - DRM_UDELAY(1); 194 + udelay(1); 195 195 } 196 196 197 197 if (i >= adev->usec_timeout) ··· 1227 1227 tmp = RREG32_SOC15(UVD, ring->me, mmUVD_CONTEXT_ID); 1228 1228 if (tmp == 0xDEADBEEF) 1229 1229 break; 1230 - DRM_UDELAY(1); 1230 + udelay(1); 1231 1231 } 1232 1232 1233 1233 if (i >= adev->usec_timeout)
+2
drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/delay.h> 27 + 26 28 #include "dm_services.h" 27 29 #include "core_types.h" 28 30 #include "timing_generator.h"
+2
drivers/gpu/drm/amd/display/dc/core/dc_stream.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/delay.h> 27 + 26 28 #include "dm_services.h" 27 29 #include "dc.h" 28 30 #include "core_types.h"
+3
drivers/gpu/drm/amd/display/dc/dc_helper.c
··· 26 26 * Created on: Aug 30, 2016 27 27 * Author: agrodzov 28 28 */ 29 + 30 + #include <linux/delay.h> 31 + 29 32 #include "dm_services.h" 30 33 #include <stdarg.h> 31 34
+2
drivers/gpu/drm/amd/display/dc/dce/dce_aux.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/delay.h> 27 + 26 28 #include "dm_services.h" 27 29 #include "core_types.h" 28 30 #include "dce_aux.h"
+2
drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/delay.h> 27 + 26 28 #include "core_types.h" 27 29 #include "link_encoder.h" 28 30 #include "dce_dmcu.h"
+3
drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c
··· 22 22 * Authors: AMD 23 23 * 24 24 */ 25 + 26 + #include <linux/delay.h> 27 + 25 28 #include "dce_i2c.h" 26 29 #include "dce_i2c_hw.h" 27 30 #include "reg_helper.h"
+3
drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c
··· 22 22 * Authors: AMD 23 23 * 24 24 */ 25 + 26 + #include <linux/delay.h> 27 + 25 28 #include "dce_i2c.h" 26 29 #include "dce_i2c_sw.h" 27 30 #include "include/gpio_service_interface.h"
+2
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/delay.h> 27 + 26 28 #include "dc_bios_types.h" 27 29 #include "dce_stream_encoder.h" 28 30 #include "reg_helper.h"
+2
drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/delay.h> 27 + 26 28 #include "dm_services.h" 27 29 28 30 #include "dce/dce_11_0_d.h"
+3
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
··· 22 22 * Authors: AMD 23 23 * 24 24 */ 25 + 26 + #include <linux/delay.h> 27 + 25 28 #include "dm_services.h" 26 29 #include "dc.h" 27 30 #include "dc_bios_types.h"
+2
drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_regamma_v.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/delay.h> 27 + 26 28 #include "dm_services.h" 27 29 28 30 /* include DCE11 register header files */
+2
drivers/gpu/drm/amd/display/dc/dce110/dce110_transform_v.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/delay.h> 27 + 26 28 #include "dce110_transform_v.h" 27 29 #include "dm_services.h" 28 30 #include "dc.h"
+2
drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/delay.h> 27 + 26 28 #include "dm_services.h" 27 29 28 30 #include "dce/dce_11_2_d.h"
+2
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/delay.h> 27 + 26 28 #include "dm_services.h" 27 29 #include "dcn10_hubp.h" 28 30 #include "dcn10_hubbub.h"
+1
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/delay.h> 26 27 27 28 #include "dc_bios_types.h" 28 29 #include "dcn10_stream_encoder.h"
+2
drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/delay.h> 27 + 26 28 #include "dm_services.h" 27 29 28 30 #include "include/gpio_types.h"