.. | .. |
---|
22 | 22 | * Authors: Alex Deucher |
---|
23 | 23 | */ |
---|
24 | 24 | #include <linux/firmware.h> |
---|
25 | | -#include <drm/drmP.h> |
---|
| 25 | + |
---|
26 | 26 | #include "radeon.h" |
---|
27 | 27 | #include "radeon_ucode.h" |
---|
28 | 28 | #include "radeon_asic.h" |
---|
.. | .. |
---|
333 | 333 | u32 me_cntl, reg_offset; |
---|
334 | 334 | int i; |
---|
335 | 335 | |
---|
336 | | - if (enable == false) { |
---|
| 336 | + if (!enable) { |
---|
337 | 337 | cik_sdma_gfx_stop(rdev); |
---|
338 | 338 | cik_sdma_rlc_stop(rdev); |
---|
339 | 339 | } |
---|
.. | .. |
---|
579 | 579 | struct radeon_fence *cik_copy_dma(struct radeon_device *rdev, |
---|
580 | 580 | uint64_t src_offset, uint64_t dst_offset, |
---|
581 | 581 | unsigned num_gpu_pages, |
---|
582 | | - struct reservation_object *resv) |
---|
| 582 | + struct dma_resv *resv) |
---|
583 | 583 | { |
---|
584 | 584 | struct radeon_fence *fence; |
---|
585 | 585 | struct radeon_sync sync; |
---|
.. | .. |
---|
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); |
---|