hc
2024-05-10 cde9070d9970eef1f7ec2360586c802a16230ad8
kernel/drivers/gpu/drm/radeon/cik_sdma.c
....@@ -22,7 +22,7 @@
2222 * Authors: Alex Deucher
2323 */
2424 #include <linux/firmware.h>
25
-#include <drm/drmP.h>
25
+
2626 #include "radeon.h"
2727 #include "radeon_ucode.h"
2828 #include "radeon_asic.h"
....@@ -333,7 +333,7 @@
333333 u32 me_cntl, reg_offset;
334334 int i;
335335
336
- if (enable == false) {
336
+ if (!enable) {
337337 cik_sdma_gfx_stop(rdev);
338338 cik_sdma_rlc_stop(rdev);
339339 }
....@@ -579,7 +579,7 @@
579579 struct radeon_fence *cik_copy_dma(struct radeon_device *rdev,
580580 uint64_t src_offset, uint64_t dst_offset,
581581 unsigned num_gpu_pages,
582
- struct reservation_object *resv)
582
+ struct dma_resv *resv)
583583 {
584584 struct radeon_fence *fence;
585585 struct radeon_sync sync;
....@@ -677,7 +677,7 @@
677677 tmp = le32_to_cpu(rdev->wb.wb[index/4]);
678678 if (tmp == 0xDEADBEEF)
679679 break;
680
- DRM_UDELAY(1);
680
+ udelay(1);
681681 }
682682
683683 if (i < rdev->usec_timeout) {
....@@ -751,7 +751,7 @@
751751 tmp = le32_to_cpu(rdev->wb.wb[index/4]);
752752 if (tmp == 0xDEADBEEF)
753753 break;
754
- DRM_UDELAY(1);
754
+ udelay(1);
755755 }
756756 if (i < rdev->usec_timeout) {
757757 DRM_INFO("ib test on ring %d succeeded in %u usecs\n", ib.fence->ring, i);