diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_asic.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_asic.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h index a0b8280663d1..77d48ba4a29a 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.h +++ b/drivers/gpu/drm/radeon/radeon_asic.h | |||
@@ -60,7 +60,8 @@ 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 | int r100_gpu_reset(struct radeon_device *rdev); | 63 | bool r100_gpu_is_lockup(struct radeon_device *rdev); |
64 | int r100_asic_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); |
66 | int r100_pci_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr); | 67 | int r100_pci_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr); |
@@ -110,8 +111,6 @@ void r100_vram_init_sizes(struct radeon_device *rdev); | |||
110 | void r100_wb_disable(struct radeon_device *rdev); | 111 | void r100_wb_disable(struct radeon_device *rdev); |
111 | void r100_wb_fini(struct radeon_device *rdev); | 112 | void r100_wb_fini(struct radeon_device *rdev); |
112 | int r100_wb_init(struct radeon_device *rdev); | 113 | int r100_wb_init(struct radeon_device *rdev); |
113 | void r100_hdp_reset(struct radeon_device *rdev); | ||
114 | int r100_rb2d_reset(struct radeon_device *rdev); | ||
115 | int r100_cp_reset(struct radeon_device *rdev); | 114 | int r100_cp_reset(struct radeon_device *rdev); |
116 | void r100_vga_render_disable(struct radeon_device *rdev); | 115 | void r100_vga_render_disable(struct radeon_device *rdev); |
117 | int r100_cs_track_check_pkt3_indx_buffer(struct radeon_cs_parser *p, | 116 | int r100_cs_track_check_pkt3_indx_buffer(struct radeon_cs_parser *p, |
@@ -126,7 +125,7 @@ int r100_cs_packet_parse(struct radeon_cs_parser *p, | |||
126 | unsigned idx); | 125 | unsigned idx); |
127 | void r100_enable_bm(struct radeon_device *rdev); | 126 | void r100_enable_bm(struct radeon_device *rdev); |
128 | void r100_set_common_regs(struct radeon_device *rdev); | 127 | void r100_set_common_regs(struct radeon_device *rdev); |
129 | 128 | void r100_bm_disable(struct radeon_device *rdev); | |
130 | /* | 129 | /* |
131 | * r200,rv250,rs300,rv280 | 130 | * r200,rv250,rs300,rv280 |
132 | */ | 131 | */ |
@@ -134,7 +133,7 @@ extern int r200_copy_dma(struct radeon_device *rdev, | |||
134 | uint64_t src_offset, | 133 | uint64_t src_offset, |
135 | uint64_t dst_offset, | 134 | uint64_t dst_offset, |
136 | unsigned num_pages, | 135 | unsigned num_pages, |
137 | struct radeon_fence *fence); | 136 | struct radeon_fence *fence); |
138 | 137 | ||
139 | /* | 138 | /* |
140 | * r300,r350,rv350,rv380 | 139 | * r300,r350,rv350,rv380 |
@@ -143,7 +142,8 @@ extern int r300_init(struct radeon_device *rdev); | |||
143 | extern void r300_fini(struct radeon_device *rdev); | 142 | extern void r300_fini(struct radeon_device *rdev); |
144 | extern int r300_suspend(struct radeon_device *rdev); | 143 | extern int r300_suspend(struct radeon_device *rdev); |
145 | extern int r300_resume(struct radeon_device *rdev); | 144 | extern int r300_resume(struct radeon_device *rdev); |
146 | extern int r300_gpu_reset(struct radeon_device *rdev); | 145 | extern bool r300_gpu_is_lockup(struct radeon_device *rdev); |
146 | extern int r300_asic_reset(struct radeon_device *rdev); | ||
147 | extern void r300_ring_start(struct radeon_device *rdev); | 147 | extern void r300_ring_start(struct radeon_device *rdev); |
148 | extern void r300_fence_ring_emit(struct radeon_device *rdev, | 148 | extern void r300_fence_ring_emit(struct radeon_device *rdev, |
149 | struct radeon_fence *fence); | 149 | struct radeon_fence *fence); |
@@ -178,6 +178,7 @@ void rs400_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); | |||
178 | /* | 178 | /* |
179 | * rs600. | 179 | * rs600. |
180 | */ | 180 | */ |
181 | extern int rs600_asic_reset(struct radeon_device *rdev); | ||
181 | extern int rs600_init(struct radeon_device *rdev); | 182 | extern int rs600_init(struct radeon_device *rdev); |
182 | extern void rs600_fini(struct radeon_device *rdev); | 183 | extern void rs600_fini(struct radeon_device *rdev); |
183 | extern int rs600_suspend(struct radeon_device *rdev); | 184 | extern int rs600_suspend(struct radeon_device *rdev); |
@@ -212,7 +213,6 @@ void rs690_bandwidth_update(struct radeon_device *rdev); | |||
212 | */ | 213 | */ |
213 | int rv515_init(struct radeon_device *rdev); | 214 | int rv515_init(struct radeon_device *rdev); |
214 | void rv515_fini(struct radeon_device *rdev); | 215 | void rv515_fini(struct radeon_device *rdev); |
215 | int rv515_gpu_reset(struct radeon_device *rdev); | ||
216 | uint32_t rv515_mc_rreg(struct radeon_device *rdev, uint32_t reg); | 216 | uint32_t rv515_mc_rreg(struct radeon_device *rdev, uint32_t reg); |
217 | void rv515_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); | 217 | void rv515_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); |
218 | void rv515_ring_start(struct radeon_device *rdev); | 218 | void rv515_ring_start(struct radeon_device *rdev); |
@@ -252,7 +252,8 @@ int r600_copy_dma(struct radeon_device *rdev, | |||
252 | struct radeon_fence *fence); | 252 | struct radeon_fence *fence); |
253 | int r600_irq_process(struct radeon_device *rdev); | 253 | int r600_irq_process(struct radeon_device *rdev); |
254 | int r600_irq_set(struct radeon_device *rdev); | 254 | int r600_irq_set(struct radeon_device *rdev); |
255 | int r600_gpu_reset(struct radeon_device *rdev); | 255 | bool r600_gpu_is_lockup(struct radeon_device *rdev); |
256 | int r600_asic_reset(struct radeon_device *rdev); | ||
256 | int r600_set_surface_reg(struct radeon_device *rdev, int reg, | 257 | int r600_set_surface_reg(struct radeon_device *rdev, int reg, |
257 | uint32_t tiling_flags, uint32_t pitch, | 258 | uint32_t tiling_flags, uint32_t pitch, |
258 | uint32_t offset, uint32_t obj_size); | 259 | uint32_t offset, uint32_t obj_size); |
@@ -276,7 +277,6 @@ int rv770_init(struct radeon_device *rdev); | |||
276 | void rv770_fini(struct radeon_device *rdev); | 277 | void rv770_fini(struct radeon_device *rdev); |
277 | int rv770_suspend(struct radeon_device *rdev); | 278 | int rv770_suspend(struct radeon_device *rdev); |
278 | int rv770_resume(struct radeon_device *rdev); | 279 | int rv770_resume(struct radeon_device *rdev); |
279 | int rv770_gpu_reset(struct radeon_device *rdev); | ||
280 | 280 | ||
281 | /* | 281 | /* |
282 | * evergreen | 282 | * evergreen |
@@ -285,7 +285,8 @@ int evergreen_init(struct radeon_device *rdev); | |||
285 | void evergreen_fini(struct radeon_device *rdev); | 285 | void evergreen_fini(struct radeon_device *rdev); |
286 | int evergreen_suspend(struct radeon_device *rdev); | 286 | int evergreen_suspend(struct radeon_device *rdev); |
287 | int evergreen_resume(struct radeon_device *rdev); | 287 | int evergreen_resume(struct radeon_device *rdev); |
288 | int evergreen_gpu_reset(struct radeon_device *rdev); | 288 | bool evergreen_gpu_is_lockup(struct radeon_device *rdev); |
289 | int evergreen_asic_reset(struct radeon_device *rdev); | ||
289 | void evergreen_bandwidth_update(struct radeon_device *rdev); | 290 | void evergreen_bandwidth_update(struct radeon_device *rdev); |
290 | void evergreen_hpd_init(struct radeon_device *rdev); | 291 | void evergreen_hpd_init(struct radeon_device *rdev); |
291 | void evergreen_hpd_fini(struct radeon_device *rdev); | 292 | void evergreen_hpd_fini(struct radeon_device *rdev); |