diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 6539d6cb4bc7..307d681b3443 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -780,6 +780,7 @@ int radeon_ib_get(struct radeon_device *rdev, int ring, | |||
780 | struct radeon_ib *ib, struct radeon_vm *vm, | 780 | struct radeon_ib *ib, struct radeon_vm *vm, |
781 | unsigned size); | 781 | unsigned size); |
782 | void radeon_ib_free(struct radeon_device *rdev, struct radeon_ib *ib); | 782 | void radeon_ib_free(struct radeon_device *rdev, struct radeon_ib *ib); |
783 | void radeon_ib_sync_to(struct radeon_ib *ib, struct radeon_fence *fence); | ||
783 | int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib, | 784 | int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib, |
784 | struct radeon_ib *const_ib); | 785 | struct radeon_ib *const_ib); |
785 | int radeon_ib_pool_init(struct radeon_device *rdev); | 786 | int radeon_ib_pool_init(struct radeon_device *rdev); |
@@ -1188,7 +1189,9 @@ struct radeon_asic { | |||
1188 | void (*fini)(struct radeon_device *rdev); | 1189 | void (*fini)(struct radeon_device *rdev); |
1189 | 1190 | ||
1190 | u32 pt_ring_index; | 1191 | u32 pt_ring_index; |
1191 | void (*set_page)(struct radeon_device *rdev, uint64_t pe, | 1192 | void (*set_page)(struct radeon_device *rdev, |
1193 | struct radeon_ib *ib, | ||
1194 | uint64_t pe, | ||
1192 | uint64_t addr, unsigned count, | 1195 | uint64_t addr, unsigned count, |
1193 | uint32_t incr, uint32_t flags); | 1196 | uint32_t incr, uint32_t flags); |
1194 | } vm; | 1197 | } vm; |
@@ -1810,7 +1813,7 @@ void radeon_ring_write(struct radeon_ring *ring, uint32_t v); | |||
1810 | #define radeon_gart_set_page(rdev, i, p) (rdev)->asic->gart.set_page((rdev), (i), (p)) | 1813 | #define radeon_gart_set_page(rdev, i, p) (rdev)->asic->gart.set_page((rdev), (i), (p)) |
1811 | #define radeon_asic_vm_init(rdev) (rdev)->asic->vm.init((rdev)) | 1814 | #define radeon_asic_vm_init(rdev) (rdev)->asic->vm.init((rdev)) |
1812 | #define radeon_asic_vm_fini(rdev) (rdev)->asic->vm.fini((rdev)) | 1815 | #define radeon_asic_vm_fini(rdev) (rdev)->asic->vm.fini((rdev)) |
1813 | #define radeon_asic_vm_set_page(rdev, pe, addr, count, incr, flags) ((rdev)->asic->vm.set_page((rdev), (pe), (addr), (count), (incr), (flags))) | 1816 | #define radeon_asic_vm_set_page(rdev, ib, pe, addr, count, incr, flags) ((rdev)->asic->vm.set_page((rdev), (ib), (pe), (addr), (count), (incr), (flags))) |
1814 | #define radeon_ring_start(rdev, r, cp) (rdev)->asic->ring[(r)].ring_start((rdev), (cp)) | 1817 | #define radeon_ring_start(rdev, r, cp) (rdev)->asic->ring[(r)].ring_start((rdev), (cp)) |
1815 | #define radeon_ring_test(rdev, r, cp) (rdev)->asic->ring[(r)].ring_test((rdev), (cp)) | 1818 | #define radeon_ring_test(rdev, r, cp) (rdev)->asic->ring[(r)].ring_test((rdev), (cp)) |
1816 | #define radeon_ib_test(rdev, r, cp) (rdev)->asic->ring[(r)].ib_test((rdev), (cp)) | 1819 | #define radeon_ib_test(rdev, r, cp) (rdev)->asic->ring[(r)].ib_test((rdev), (cp)) |