hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/gpu/drm/radeon/radeon_asic.h
....@@ -86,7 +86,7 @@
8686 uint64_t src_offset,
8787 uint64_t dst_offset,
8888 unsigned num_gpu_pages,
89
- struct reservation_object *resv);
89
+ struct dma_resv *resv);
9090 int r100_set_surface_reg(struct radeon_device *rdev, int reg,
9191 uint32_t tiling_flags, uint32_t pitch,
9292 uint32_t offset, uint32_t obj_size);
....@@ -157,7 +157,7 @@
157157 uint64_t src_offset,
158158 uint64_t dst_offset,
159159 unsigned num_gpu_pages,
160
- struct reservation_object *resv);
160
+ struct dma_resv *resv);
161161 void r200_set_safe_registers(struct radeon_device *rdev);
162162
163163 /*
....@@ -347,11 +347,11 @@
347347 struct radeon_fence *r600_copy_cpdma(struct radeon_device *rdev,
348348 uint64_t src_offset, uint64_t dst_offset,
349349 unsigned num_gpu_pages,
350
- struct reservation_object *resv);
350
+ struct dma_resv *resv);
351351 struct radeon_fence *r600_copy_dma(struct radeon_device *rdev,
352352 uint64_t src_offset, uint64_t dst_offset,
353353 unsigned num_gpu_pages,
354
- struct reservation_object *resv);
354
+ struct dma_resv *resv);
355355 void r600_hpd_init(struct radeon_device *rdev);
356356 void r600_hpd_fini(struct radeon_device *rdev);
357357 bool r600_hpd_sense(struct radeon_device *rdev, enum radeon_hpd_id hpd);
....@@ -473,7 +473,7 @@
473473 struct radeon_fence *rv770_copy_dma(struct radeon_device *rdev,
474474 uint64_t src_offset, uint64_t dst_offset,
475475 unsigned num_gpu_pages,
476
- struct reservation_object *resv);
476
+ struct dma_resv *resv);
477477 u32 rv770_get_xclk(struct radeon_device *rdev);
478478 int rv770_set_uvd_clocks(struct radeon_device *rdev, u32 vclk, u32 dclk);
479479 int rv770_get_temp(struct radeon_device *rdev);
....@@ -547,7 +547,7 @@
547547 struct radeon_fence *evergreen_copy_dma(struct radeon_device *rdev,
548548 uint64_t src_offset, uint64_t dst_offset,
549549 unsigned num_gpu_pages,
550
- struct reservation_object *resv);
550
+ struct dma_resv *resv);
551551 int evergreen_get_temp(struct radeon_device *rdev);
552552 int evergreen_get_allowed_info_register(struct radeon_device *rdev,
553553 u32 reg, u32 *val);
....@@ -725,7 +725,7 @@
725725 struct radeon_fence *si_copy_dma(struct radeon_device *rdev,
726726 uint64_t src_offset, uint64_t dst_offset,
727727 unsigned num_gpu_pages,
728
- struct reservation_object *resv);
728
+ struct dma_resv *resv);
729729
730730 void si_dma_vm_copy_pages(struct radeon_device *rdev,
731731 struct radeon_ib *ib,
....@@ -796,11 +796,11 @@
796796 struct radeon_fence *cik_copy_dma(struct radeon_device *rdev,
797797 uint64_t src_offset, uint64_t dst_offset,
798798 unsigned num_gpu_pages,
799
- struct reservation_object *resv);
799
+ struct dma_resv *resv);
800800 struct radeon_fence *cik_copy_cpdma(struct radeon_device *rdev,
801801 uint64_t src_offset, uint64_t dst_offset,
802802 unsigned num_gpu_pages,
803
- struct reservation_object *resv);
803
+ struct dma_resv *resv);
804804 int cik_sdma_ring_test(struct radeon_device *rdev, struct radeon_ring *ring);
805805 int cik_sdma_ib_test(struct radeon_device *rdev, struct radeon_ring *ring);
806806 bool cik_sdma_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring);