hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/gpu/drm/radeon/r600_dma.c
....@@ -21,7 +21,7 @@
2121 *
2222 * Authors: Alex Deucher
2323 */
24
-#include <drm/drmP.h>
24
+
2525 #include "radeon.h"
2626 #include "radeon_asic.h"
2727 #include "r600d.h"
....@@ -261,7 +261,7 @@
261261 tmp = le32_to_cpu(rdev->wb.wb[index/4]);
262262 if (tmp == 0xDEADBEEF)
263263 break;
264
- DRM_UDELAY(1);
264
+ udelay(1);
265265 }
266266
267267 if (i < rdev->usec_timeout) {
....@@ -382,7 +382,7 @@
382382 tmp = le32_to_cpu(rdev->wb.wb[index/4]);
383383 if (tmp == 0xDEADBEEF)
384384 break;
385
- DRM_UDELAY(1);
385
+ udelay(1);
386386 }
387387 if (i < rdev->usec_timeout) {
388388 DRM_INFO("ib test on ring %d succeeded in %u usecs\n", ib.fence->ring, i);
....@@ -444,7 +444,7 @@
444444 struct radeon_fence *r600_copy_dma(struct radeon_device *rdev,
445445 uint64_t src_offset, uint64_t dst_offset,
446446 unsigned num_gpu_pages,
447
- struct reservation_object *resv)
447
+ struct dma_resv *resv)
448448 {
449449 struct radeon_fence *fence;
450450 struct radeon_sync sync;