diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_asic.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_asic.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h index a0b8280663d..ce2f3e4f081 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.h +++ b/drivers/gpu/drm/radeon/radeon_asic.h | |||
@@ -60,6 +60,7 @@ int r100_resume(struct radeon_device *rdev); | |||
60 | uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg); | 60 | uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg); |
61 | void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); | 61 | void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); |
62 | void r100_vga_set_state(struct radeon_device *rdev, bool state); | 62 | void r100_vga_set_state(struct radeon_device *rdev, bool state); |
63 | bool r100_gpu_is_lockup(struct radeon_device *rdev); | ||
63 | int r100_gpu_reset(struct radeon_device *rdev); | 64 | int r100_gpu_reset(struct radeon_device *rdev); |
64 | u32 r100_get_vblank_counter(struct radeon_device *rdev, int crtc); | 65 | u32 r100_get_vblank_counter(struct radeon_device *rdev, int crtc); |
65 | void r100_pci_gart_tlb_flush(struct radeon_device *rdev); | 66 | void r100_pci_gart_tlb_flush(struct radeon_device *rdev); |
@@ -134,7 +135,7 @@ extern int r200_copy_dma(struct radeon_device *rdev, | |||
134 | uint64_t src_offset, | 135 | uint64_t src_offset, |
135 | uint64_t dst_offset, | 136 | uint64_t dst_offset, |
136 | unsigned num_pages, | 137 | unsigned num_pages, |
137 | struct radeon_fence *fence); | 138 | struct radeon_fence *fence); |
138 | 139 | ||
139 | /* | 140 | /* |
140 | * r300,r350,rv350,rv380 | 141 | * r300,r350,rv350,rv380 |
@@ -143,6 +144,7 @@ extern int r300_init(struct radeon_device *rdev); | |||
143 | extern void r300_fini(struct radeon_device *rdev); | 144 | extern void r300_fini(struct radeon_device *rdev); |
144 | extern int r300_suspend(struct radeon_device *rdev); | 145 | extern int r300_suspend(struct radeon_device *rdev); |
145 | extern int r300_resume(struct radeon_device *rdev); | 146 | extern int r300_resume(struct radeon_device *rdev); |
147 | extern bool r300_gpu_is_lockup(struct radeon_device *rdev); | ||
146 | extern int r300_gpu_reset(struct radeon_device *rdev); | 148 | extern int r300_gpu_reset(struct radeon_device *rdev); |
147 | extern void r300_ring_start(struct radeon_device *rdev); | 149 | extern void r300_ring_start(struct radeon_device *rdev); |
148 | extern void r300_fence_ring_emit(struct radeon_device *rdev, | 150 | extern void r300_fence_ring_emit(struct radeon_device *rdev, |
@@ -252,6 +254,7 @@ int r600_copy_dma(struct radeon_device *rdev, | |||
252 | struct radeon_fence *fence); | 254 | struct radeon_fence *fence); |
253 | int r600_irq_process(struct radeon_device *rdev); | 255 | int r600_irq_process(struct radeon_device *rdev); |
254 | int r600_irq_set(struct radeon_device *rdev); | 256 | int r600_irq_set(struct radeon_device *rdev); |
257 | bool r600_gpu_is_lockup(struct radeon_device *rdev); | ||
255 | int r600_gpu_reset(struct radeon_device *rdev); | 258 | int r600_gpu_reset(struct radeon_device *rdev); |
256 | int r600_set_surface_reg(struct radeon_device *rdev, int reg, | 259 | int r600_set_surface_reg(struct radeon_device *rdev, int reg, |
257 | uint32_t tiling_flags, uint32_t pitch, | 260 | uint32_t tiling_flags, uint32_t pitch, |
@@ -276,7 +279,6 @@ int rv770_init(struct radeon_device *rdev); | |||
276 | void rv770_fini(struct radeon_device *rdev); | 279 | void rv770_fini(struct radeon_device *rdev); |
277 | int rv770_suspend(struct radeon_device *rdev); | 280 | int rv770_suspend(struct radeon_device *rdev); |
278 | int rv770_resume(struct radeon_device *rdev); | 281 | int rv770_resume(struct radeon_device *rdev); |
279 | int rv770_gpu_reset(struct radeon_device *rdev); | ||
280 | 282 | ||
281 | /* | 283 | /* |
282 | * evergreen | 284 | * evergreen |
@@ -285,6 +287,7 @@ int evergreen_init(struct radeon_device *rdev); | |||
285 | void evergreen_fini(struct radeon_device *rdev); | 287 | void evergreen_fini(struct radeon_device *rdev); |
286 | int evergreen_suspend(struct radeon_device *rdev); | 288 | int evergreen_suspend(struct radeon_device *rdev); |
287 | int evergreen_resume(struct radeon_device *rdev); | 289 | int evergreen_resume(struct radeon_device *rdev); |
290 | bool evergreen_gpu_is_lockup(struct radeon_device *rdev); | ||
288 | int evergreen_gpu_reset(struct radeon_device *rdev); | 291 | int evergreen_gpu_reset(struct radeon_device *rdev); |
289 | void evergreen_bandwidth_update(struct radeon_device *rdev); | 292 | void evergreen_bandwidth_update(struct radeon_device *rdev); |
290 | void evergreen_hpd_init(struct radeon_device *rdev); | 293 | void evergreen_hpd_init(struct radeon_device *rdev); |