.. | .. |
---|
21 | 21 | * |
---|
22 | 22 | * Authors: Alex Deucher |
---|
23 | 23 | */ |
---|
24 | | -#include <drm/drmP.h> |
---|
| 24 | + |
---|
25 | 25 | #include "radeon.h" |
---|
26 | 26 | #include "radeon_asic.h" |
---|
27 | 27 | #include "r600d.h" |
---|
.. | .. |
---|
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); |
---|
.. | .. |
---|
444 | 444 | struct radeon_fence *r600_copy_dma(struct radeon_device *rdev, |
---|
445 | 445 | uint64_t src_offset, uint64_t dst_offset, |
---|
446 | 446 | unsigned num_gpu_pages, |
---|
447 | | - struct reservation_object *resv) |
---|
| 447 | + struct dma_resv *resv) |
---|
448 | 448 | { |
---|
449 | 449 | struct radeon_fence *fence; |
---|
450 | 450 | struct radeon_sync sync; |
---|