aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_asic.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_asic.h')
-rw-r--r--drivers/gpu/drm/radeon/radeon_asic.h7
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);
60uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg); 60uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg);
61void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); 61void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);
62void r100_vga_set_state(struct radeon_device *rdev, bool state); 62void r100_vga_set_state(struct radeon_device *rdev, bool state);
63bool r100_gpu_is_lockup(struct radeon_device *rdev);
63int r100_gpu_reset(struct radeon_device *rdev); 64int r100_gpu_reset(struct radeon_device *rdev);
64u32 r100_get_vblank_counter(struct radeon_device *rdev, int crtc); 65u32 r100_get_vblank_counter(struct radeon_device *rdev, int crtc);
65void r100_pci_gart_tlb_flush(struct radeon_device *rdev); 66void 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);
143extern void r300_fini(struct radeon_device *rdev); 144extern void r300_fini(struct radeon_device *rdev);
144extern int r300_suspend(struct radeon_device *rdev); 145extern int r300_suspend(struct radeon_device *rdev);
145extern int r300_resume(struct radeon_device *rdev); 146extern int r300_resume(struct radeon_device *rdev);
147extern bool r300_gpu_is_lockup(struct radeon_device *rdev);
146extern int r300_gpu_reset(struct radeon_device *rdev); 148extern int r300_gpu_reset(struct radeon_device *rdev);
147extern void r300_ring_start(struct radeon_device *rdev); 149extern void r300_ring_start(struct radeon_device *rdev);
148extern void r300_fence_ring_emit(struct radeon_device *rdev, 150extern 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);
253int r600_irq_process(struct radeon_device *rdev); 255int r600_irq_process(struct radeon_device *rdev);
254int r600_irq_set(struct radeon_device *rdev); 256int r600_irq_set(struct radeon_device *rdev);
257bool r600_gpu_is_lockup(struct radeon_device *rdev);
255int r600_gpu_reset(struct radeon_device *rdev); 258int r600_gpu_reset(struct radeon_device *rdev);
256int r600_set_surface_reg(struct radeon_device *rdev, int reg, 259int 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);
276void rv770_fini(struct radeon_device *rdev); 279void rv770_fini(struct radeon_device *rdev);
277int rv770_suspend(struct radeon_device *rdev); 280int rv770_suspend(struct radeon_device *rdev);
278int rv770_resume(struct radeon_device *rdev); 281int rv770_resume(struct radeon_device *rdev);
279int 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);
285void evergreen_fini(struct radeon_device *rdev); 287void evergreen_fini(struct radeon_device *rdev);
286int evergreen_suspend(struct radeon_device *rdev); 288int evergreen_suspend(struct radeon_device *rdev);
287int evergreen_resume(struct radeon_device *rdev); 289int evergreen_resume(struct radeon_device *rdev);
290bool evergreen_gpu_is_lockup(struct radeon_device *rdev);
288int evergreen_gpu_reset(struct radeon_device *rdev); 291int evergreen_gpu_reset(struct radeon_device *rdev);
289void evergreen_bandwidth_update(struct radeon_device *rdev); 292void evergreen_bandwidth_update(struct radeon_device *rdev);
290void evergreen_hpd_init(struct radeon_device *rdev); 293void evergreen_hpd_init(struct radeon_device *rdev);