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

Configure Feed

Select the types of activity you want to include in your feed.

drm/radeon: drop dependency on drm_os_linux.h

The drm_os_linux.h header file is deprecated.
Drop all uses of symbols from this file.
All macros are just opencoded.
A few adjustments to include files was required as the obsolete
drm_os_linux.h included these headers.

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/20190608080241.4958-4-sam@ravnborg.org

+31 -24
+2 -2
drivers/gpu/drm/radeon/cik.c
··· 3480 3480 tmp = RREG32(scratch); 3481 3481 if (tmp == 0xDEADBEEF) 3482 3482 break; 3483 - DRM_UDELAY(1); 3483 + udelay(1); 3484 3484 } 3485 3485 if (i < rdev->usec_timeout) { 3486 3486 DRM_INFO("ring test on %d succeeded in %d usecs\n", ring->idx, i); ··· 3825 3825 tmp = RREG32(scratch); 3826 3826 if (tmp == 0xDEADBEEF) 3827 3827 break; 3828 - DRM_UDELAY(1); 3828 + udelay(1); 3829 3829 } 3830 3830 if (i < rdev->usec_timeout) { 3831 3831 DRM_INFO("ib test on ring %d succeeded in %u usecs\n", ib.fence->ring, i);
+2 -2
drivers/gpu/drm/radeon/cik_sdma.c
··· 677 677 tmp = le32_to_cpu(rdev->wb.wb[index/4]); 678 678 if (tmp == 0xDEADBEEF) 679 679 break; 680 - DRM_UDELAY(1); 680 + udelay(1); 681 681 } 682 682 683 683 if (i < rdev->usec_timeout) { ··· 751 751 tmp = le32_to_cpu(rdev->wb.wb[index/4]); 752 752 if (tmp == 0xDEADBEEF) 753 753 break; 754 - DRM_UDELAY(1); 754 + udelay(1); 755 755 } 756 756 if (i < rdev->usec_timeout) { 757 757 DRM_INFO("ib test on ring %d succeeded in %u usecs\n", ib.fence->ring, i);
+5 -5
drivers/gpu/drm/radeon/r100.c
··· 2470 2470 if (tmp >= n) { 2471 2471 return 0; 2472 2472 } 2473 - DRM_UDELAY(1); 2473 + udelay(1); 2474 2474 } 2475 2475 return -1; 2476 2476 } ··· 2488 2488 if (!(tmp & RADEON_RBBM_ACTIVE)) { 2489 2489 return 0; 2490 2490 } 2491 - DRM_UDELAY(1); 2491 + udelay(1); 2492 2492 } 2493 2493 return -1; 2494 2494 } ··· 2504 2504 if (tmp & RADEON_MC_IDLE) { 2505 2505 return 0; 2506 2506 } 2507 - DRM_UDELAY(1); 2507 + udelay(1); 2508 2508 } 2509 2509 return -1; 2510 2510 } ··· 3669 3669 if (tmp == 0xDEADBEEF) { 3670 3670 break; 3671 3671 } 3672 - DRM_UDELAY(1); 3672 + udelay(1); 3673 3673 } 3674 3674 if (i < rdev->usec_timeout) { 3675 3675 DRM_INFO("ring test succeeded in %d usecs\n", i); ··· 3746 3746 if (tmp == 0xDEADBEEF) { 3747 3747 break; 3748 3748 } 3749 - DRM_UDELAY(1); 3749 + udelay(1); 3750 3750 } 3751 3751 if (i < rdev->usec_timeout) { 3752 3752 DRM_INFO("ib test succeeded in %u usecs\n", i);
+1 -1
drivers/gpu/drm/radeon/r300.c
··· 350 350 if (tmp & R300_MC_IDLE) { 351 351 return 0; 352 352 } 353 - DRM_UDELAY(1); 353 + udelay(1); 354 354 } 355 355 return -1; 356 356 }
+1 -1
drivers/gpu/drm/radeon/r520.c
··· 44 44 if (tmp & R520_MC_STATUS_IDLE) { 45 45 return 0; 46 46 } 47 - DRM_UDELAY(1); 47 + udelay(1); 48 48 } 49 49 return -1; 50 50 }
+2 -2
drivers/gpu/drm/radeon/r600.c
··· 2840 2840 tmp = RREG32(scratch); 2841 2841 if (tmp == 0xDEADBEEF) 2842 2842 break; 2843 - DRM_UDELAY(1); 2843 + udelay(1); 2844 2844 } 2845 2845 if (i < rdev->usec_timeout) { 2846 2846 DRM_INFO("ring test on %d succeeded in %d usecs\n", ring->idx, i); ··· 3433 3433 tmp = RREG32(scratch); 3434 3434 if (tmp == 0xDEADBEEF) 3435 3435 break; 3436 - DRM_UDELAY(1); 3436 + udelay(1); 3437 3437 } 3438 3438 if (i < rdev->usec_timeout) { 3439 3439 DRM_INFO("ib test on ring %d succeeded in %u usecs\n", ib.fence->ring, i);
+2 -2
drivers/gpu/drm/radeon/r600_dma.c
··· 261 261 tmp = le32_to_cpu(rdev->wb.wb[index/4]); 262 262 if (tmp == 0xDEADBEEF) 263 263 break; 264 - DRM_UDELAY(1); 264 + udelay(1); 265 265 } 266 266 267 267 if (i < rdev->usec_timeout) { ··· 382 382 tmp = le32_to_cpu(rdev->wb.wb[index/4]); 383 383 if (tmp == 0xDEADBEEF) 384 384 break; 385 - DRM_UDELAY(1); 385 + udelay(1); 386 386 } 387 387 if (i < rdev->usec_timeout) { 388 388 DRM_INFO("ib test on ring %d succeeded in %u usecs\n", ib.fence->ring, i);
+8 -4
drivers/gpu/drm/radeon/radeon_fence.c
··· 28 28 * Jerome Glisse <glisse@freedesktop.org> 29 29 * Dave Airlie 30 30 */ 31 - #include <linux/seq_file.h> 31 + 32 32 #include <linux/atomic.h> 33 - #include <linux/wait.h> 34 - #include <linux/kref.h> 35 - #include <linux/slab.h> 36 33 #include <linux/firmware.h> 34 + #include <linux/kref.h> 35 + #include <linux/sched/signal.h> 36 + #include <linux/seq_file.h> 37 + #include <linux/slab.h> 38 + #include <linux/wait.h> 39 + 37 40 #include <drm/drmP.h> 41 + 38 42 #include "radeon_reg.h" 39 43 #include "radeon.h" 40 44 #include "radeon_trace.h"
+1 -1
drivers/gpu/drm/radeon/radeon_vce.c
··· 771 771 for (i = 0; i < rdev->usec_timeout; i++) { 772 772 if (vce_v1_0_get_rptr(rdev, ring) != rptr) 773 773 break; 774 - DRM_UDELAY(1); 774 + udelay(1); 775 775 } 776 776 777 777 if (i < rdev->usec_timeout) {
+2 -2
drivers/gpu/drm/radeon/rs400.c
··· 67 67 tmp = RREG32_MC(RS480_GART_CACHE_CNTRL); 68 68 if ((tmp & RS480_GART_CACHE_INVALIDATE) == 0) 69 69 break; 70 - DRM_UDELAY(1); 70 + udelay(1); 71 71 timeout--; 72 72 } while (timeout > 0); 73 73 WREG32_MC(RS480_GART_CACHE_CNTRL, 0); ··· 245 245 if (tmp & RADEON_MC_IDLE) { 246 246 return 0; 247 247 } 248 - DRM_UDELAY(1); 248 + udelay(1); 249 249 } 250 250 return -1; 251 251 }
+3
drivers/gpu/drm/radeon/rs600.c
··· 35 35 * close to the one of the R600 family (R600 likely being an evolution 36 36 * of the RS600 GART block). 37 37 */ 38 + 39 + #include <linux/io-64-nonatomic-lo-hi.h> 40 + 38 41 #include <drm/drmP.h> 39 42 #include "radeon.h" 40 43 #include "radeon_asic.h"
+1 -1
drivers/gpu/drm/radeon/rv515.c
··· 138 138 if (tmp & MC_STATUS_IDLE) { 139 139 return 0; 140 140 } 141 - DRM_UDELAY(1); 141 + udelay(1); 142 142 } 143 143 return -1; 144 144 }
+1 -1
drivers/gpu/drm/radeon/uvd_v1_0.c
··· 438 438 tmp = RREG32(UVD_CONTEXT_ID); 439 439 if (tmp == 0xDEADBEEF) 440 440 break; 441 - DRM_UDELAY(1); 441 + udelay(1); 442 442 } 443 443 444 444 if (i < rdev->usec_timeout) {