hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/drivers/gpu/drm/radeon/radeon_test.c
....@@ -22,7 +22,7 @@
2222 *
2323 * Authors: Michel Dänzer
2424 */
25
-#include <drm/drmP.h>
25
+
2626 #include <drm/radeon_drm.h>
2727 #include "radeon_reg.h"
2828 #include "radeon.h"
....@@ -120,11 +120,11 @@
120120 if (ring == R600_RING_TYPE_DMA_INDEX)
121121 fence = radeon_copy_dma(rdev, gtt_addr, vram_addr,
122122 size / RADEON_GPU_PAGE_SIZE,
123
- vram_obj->tbo.resv);
123
+ vram_obj->tbo.base.resv);
124124 else
125125 fence = radeon_copy_blit(rdev, gtt_addr, vram_addr,
126126 size / RADEON_GPU_PAGE_SIZE,
127
- vram_obj->tbo.resv);
127
+ vram_obj->tbo.base.resv);
128128 if (IS_ERR(fence)) {
129129 DRM_ERROR("Failed GTT->VRAM copy %d\n", i);
130130 r = PTR_ERR(fence);
....@@ -171,11 +171,11 @@
171171 if (ring == R600_RING_TYPE_DMA_INDEX)
172172 fence = radeon_copy_dma(rdev, vram_addr, gtt_addr,
173173 size / RADEON_GPU_PAGE_SIZE,
174
- vram_obj->tbo.resv);
174
+ vram_obj->tbo.base.resv);
175175 else
176176 fence = radeon_copy_blit(rdev, vram_addr, gtt_addr,
177177 size / RADEON_GPU_PAGE_SIZE,
178
- vram_obj->tbo.resv);
178
+ vram_obj->tbo.base.resv);
179179 if (IS_ERR(fence)) {
180180 DRM_ERROR("Failed VRAM->GTT copy %d\n", i);
181181 r = PTR_ERR(fence);
....@@ -348,7 +348,7 @@
348348 if (r)
349349 goto out_cleanup;
350350
351
- mdelay(1000);
351
+ msleep(1000);
352352
353353 if (radeon_fence_signaled(fence1)) {
354354 DRM_ERROR("Fence 1 signaled without waiting for semaphore.\n");
....@@ -369,7 +369,7 @@
369369 goto out_cleanup;
370370 }
371371
372
- mdelay(1000);
372
+ msleep(1000);
373373
374374 if (radeon_fence_signaled(fence2)) {
375375 DRM_ERROR("Fence 2 signaled without waiting for semaphore.\n");
....@@ -442,7 +442,7 @@
442442 if (r)
443443 goto out_cleanup;
444444
445
- mdelay(1000);
445
+ msleep(1000);
446446
447447 if (radeon_fence_signaled(fenceA)) {
448448 DRM_ERROR("Fence A signaled without waiting for semaphore.\n");
....@@ -462,7 +462,7 @@
462462 radeon_ring_unlock_commit(rdev, ringC, false);
463463
464464 for (i = 0; i < 30; ++i) {
465
- mdelay(100);
465
+ msleep(100);
466466 sigA = radeon_fence_signaled(fenceA);
467467 sigB = radeon_fence_signaled(fenceB);
468468 if (sigA || sigB)
....@@ -487,7 +487,7 @@
487487 radeon_semaphore_emit_signal(rdev, ringC->idx, semaphore);
488488 radeon_ring_unlock_commit(rdev, ringC, false);
489489
490
- mdelay(1000);
490
+ msleep(1000);
491491
492492 r = radeon_fence_wait(fenceA, false);
493493 if (r) {