移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/gpu/drm/radeon/radeon_test.c
..
..
@@ -22,7 +22,7 @@
22
22
  *
23
23
  * Authors: Michel Dänzer
24
24
  */
25
-#include <drm/drmP.h>
25
+
26
26
 #include <drm/radeon_drm.h>
27
27
 #include "radeon_reg.h"
28
28
 #include "radeon.h"
..
..
@@ -120,11 +120,11 @@
120
120
 		if (ring == R600_RING_TYPE_DMA_INDEX)
121
121
 			fence = radeon_copy_dma(rdev, gtt_addr, vram_addr,
122
122
 						size / RADEON_GPU_PAGE_SIZE,
123
-						vram_obj->tbo.resv);
123
+						vram_obj->tbo.base.resv);
124
124
 		else
125
125
 			fence = radeon_copy_blit(rdev, gtt_addr, vram_addr,
126
126
 						 size / RADEON_GPU_PAGE_SIZE,
127
-						 vram_obj->tbo.resv);
127
+						 vram_obj->tbo.base.resv);
128
128
 		if (IS_ERR(fence)) {
129
129
 			DRM_ERROR("Failed GTT->VRAM copy %d\n", i);
130
130
 			r = PTR_ERR(fence);
..
..
@@ -171,11 +171,11 @@
171
171
 		if (ring == R600_RING_TYPE_DMA_INDEX)
172
172
 			fence = radeon_copy_dma(rdev, vram_addr, gtt_addr,
173
173
 						size / RADEON_GPU_PAGE_SIZE,
174
-						vram_obj->tbo.resv);
174
+						vram_obj->tbo.base.resv);
175
175
 		else
176
176
 			fence = radeon_copy_blit(rdev, vram_addr, gtt_addr,
177
177
 						 size / RADEON_GPU_PAGE_SIZE,
178
-						 vram_obj->tbo.resv);
178
+						 vram_obj->tbo.base.resv);
179
179
 		if (IS_ERR(fence)) {
180
180
 			DRM_ERROR("Failed VRAM->GTT copy %d\n", i);
181
181
 			r = PTR_ERR(fence);
..
..
@@ -348,7 +348,7 @@
348
348
 	if (r)
349
349
 		goto out_cleanup;
350
350
 
351
-	mdelay(1000);
351
+	msleep(1000);
352
352
 
353
353
 	if (radeon_fence_signaled(fence1)) {
354
354
 		DRM_ERROR("Fence 1 signaled without waiting for semaphore.\n");
..
..
@@ -369,7 +369,7 @@
369
369
 		goto out_cleanup;
370
370
 	}
371
371
 
372
-	mdelay(1000);
372
+	msleep(1000);
373
373
 
374
374
 	if (radeon_fence_signaled(fence2)) {
375
375
 		DRM_ERROR("Fence 2 signaled without waiting for semaphore.\n");
..
..
@@ -442,7 +442,7 @@
442
442
 	if (r)
443
443
 		goto out_cleanup;
444
444
 
445
-	mdelay(1000);
445
+	msleep(1000);
446
446
 
447
447
 	if (radeon_fence_signaled(fenceA)) {
448
448
 		DRM_ERROR("Fence A signaled without waiting for semaphore.\n");
..
..
@@ -462,7 +462,7 @@
462
462
 	radeon_ring_unlock_commit(rdev, ringC, false);
463
463
 
464
464
 	for (i = 0; i < 30; ++i) {
465
-		mdelay(100);
465
+		msleep(100);
466
466
 		sigA = radeon_fence_signaled(fenceA);
467
467
 		sigB = radeon_fence_signaled(fenceB);
468
468
 		if (sigA || sigB)
..
..
@@ -487,7 +487,7 @@
487
487
 	radeon_semaphore_emit_signal(rdev, ringC->idx, semaphore);
488
488
 	radeon_ring_unlock_commit(rdev, ringC, false);
489
489
 
490
-	mdelay(1000);
490
+	msleep(1000);
491
491
 
492
492
 	r = radeon_fence_wait(fenceA, false);
493
493
 	if (r) {