diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-03-11 16:19:18 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-03-14 21:27:29 -0400 |
commit | 2b497502b7cef167288a08737403a5a6cec697f0 (patch) | |
tree | fb597b6a96d4e5b4e2aad61b736886377ff064d0 /drivers/gpu/drm | |
parent | e6990375ef4ec449994991034238f1ffab8a3a1a (diff) |
drm/radeon: collect r100 asic related declarations in radeon_asic.h
This just an example to show what radeon_asic.h might be good for.
Before Jerome kills it ;)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 47 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_asic.h | 52 |
2 files changed, 48 insertions, 51 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index a8552eec0643..bd63f5370702 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -730,8 +730,6 @@ int radeon_debugfs_add_files(struct radeon_device *rdev, | |||
730 | struct drm_info_list *files, | 730 | struct drm_info_list *files, |
731 | unsigned nfiles); | 731 | unsigned nfiles); |
732 | int radeon_debugfs_fence_init(struct radeon_device *rdev); | 732 | int radeon_debugfs_fence_init(struct radeon_device *rdev); |
733 | int r100_debugfs_rbbm_init(struct radeon_device *rdev); | ||
734 | int r100_debugfs_cp_init(struct radeon_device *rdev); | ||
735 | 733 | ||
736 | 734 | ||
737 | /* | 735 | /* |
@@ -1195,51 +1193,6 @@ extern int radeon_resume_kms(struct drm_device *dev); | |||
1195 | extern int radeon_suspend_kms(struct drm_device *dev, pm_message_t state); | 1193 | extern int radeon_suspend_kms(struct drm_device *dev, pm_message_t state); |
1196 | 1194 | ||
1197 | /* r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280 */ | 1195 | /* r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280 */ |
1198 | struct r100_mc_save { | ||
1199 | u32 GENMO_WT; | ||
1200 | u32 CRTC_EXT_CNTL; | ||
1201 | u32 CRTC_GEN_CNTL; | ||
1202 | u32 CRTC2_GEN_CNTL; | ||
1203 | u32 CUR_OFFSET; | ||
1204 | u32 CUR2_OFFSET; | ||
1205 | }; | ||
1206 | extern void r100_cp_disable(struct radeon_device *rdev); | ||
1207 | extern int r100_cp_init(struct radeon_device *rdev, unsigned ring_size); | ||
1208 | extern void r100_cp_fini(struct radeon_device *rdev); | ||
1209 | extern void r100_pci_gart_tlb_flush(struct radeon_device *rdev); | ||
1210 | extern int r100_pci_gart_init(struct radeon_device *rdev); | ||
1211 | extern void r100_pci_gart_fini(struct radeon_device *rdev); | ||
1212 | extern int r100_pci_gart_enable(struct radeon_device *rdev); | ||
1213 | extern void r100_pci_gart_disable(struct radeon_device *rdev); | ||
1214 | extern int r100_pci_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr); | ||
1215 | extern int r100_debugfs_mc_info_init(struct radeon_device *rdev); | ||
1216 | extern int r100_gui_wait_for_idle(struct radeon_device *rdev); | ||
1217 | extern void r100_ib_fini(struct radeon_device *rdev); | ||
1218 | extern int r100_ib_init(struct radeon_device *rdev); | ||
1219 | extern void r100_irq_disable(struct radeon_device *rdev); | ||
1220 | extern int r100_irq_set(struct radeon_device *rdev); | ||
1221 | extern void r100_mc_stop(struct radeon_device *rdev, struct r100_mc_save *save); | ||
1222 | extern void r100_mc_resume(struct radeon_device *rdev, struct r100_mc_save *save); | ||
1223 | extern void r100_vram_init_sizes(struct radeon_device *rdev); | ||
1224 | extern void r100_wb_disable(struct radeon_device *rdev); | ||
1225 | extern void r100_wb_fini(struct radeon_device *rdev); | ||
1226 | extern int r100_wb_init(struct radeon_device *rdev); | ||
1227 | extern void r100_hdp_reset(struct radeon_device *rdev); | ||
1228 | extern int r100_rb2d_reset(struct radeon_device *rdev); | ||
1229 | extern int r100_cp_reset(struct radeon_device *rdev); | ||
1230 | extern void r100_vga_render_disable(struct radeon_device *rdev); | ||
1231 | extern int r100_cs_track_check_pkt3_indx_buffer(struct radeon_cs_parser *p, | ||
1232 | struct radeon_cs_packet *pkt, | ||
1233 | struct radeon_bo *robj); | ||
1234 | extern int r100_cs_parse_packet0(struct radeon_cs_parser *p, | ||
1235 | struct radeon_cs_packet *pkt, | ||
1236 | const unsigned *auth, unsigned n, | ||
1237 | radeon_packet0_check_t check); | ||
1238 | extern int r100_cs_packet_parse(struct radeon_cs_parser *p, | ||
1239 | struct radeon_cs_packet *pkt, | ||
1240 | unsigned idx); | ||
1241 | extern void r100_enable_bm(struct radeon_device *rdev); | ||
1242 | extern void r100_set_common_regs(struct radeon_device *rdev); | ||
1243 | 1196 | ||
1244 | /* rv200,rv250,rv280 */ | 1197 | /* rv200,rv250,rv280 */ |
1245 | extern void r200_set_safe_registers(struct radeon_device *rdev); | 1198 | extern void r200_set_safe_registers(struct radeon_device *rdev); |
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h index 4c0d3dab794d..a0b8280663d1 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.h +++ b/drivers/gpu/drm/radeon/radeon_asic.h | |||
@@ -45,10 +45,18 @@ void radeon_atom_set_clock_gating(struct radeon_device *rdev, int enable); | |||
45 | /* | 45 | /* |
46 | * r100,rv100,rs100,rv200,rs200 | 46 | * r100,rv100,rs100,rv200,rs200 |
47 | */ | 47 | */ |
48 | extern int r100_init(struct radeon_device *rdev); | 48 | struct r100_mc_save { |
49 | extern void r100_fini(struct radeon_device *rdev); | 49 | u32 GENMO_WT; |
50 | extern int r100_suspend(struct radeon_device *rdev); | 50 | u32 CRTC_EXT_CNTL; |
51 | extern int r100_resume(struct radeon_device *rdev); | 51 | u32 CRTC_GEN_CNTL; |
52 | u32 CRTC2_GEN_CNTL; | ||
53 | u32 CUR_OFFSET; | ||
54 | u32 CUR2_OFFSET; | ||
55 | }; | ||
56 | int r100_init(struct radeon_device *rdev); | ||
57 | void r100_fini(struct radeon_device *rdev); | ||
58 | int r100_suspend(struct radeon_device *rdev); | ||
59 | int r100_resume(struct radeon_device *rdev); | ||
52 | 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); |
53 | 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); |
54 | void r100_vga_set_state(struct radeon_device *rdev, bool state); | 62 | void r100_vga_set_state(struct radeon_device *rdev, bool state); |
@@ -82,6 +90,42 @@ void r100_hpd_fini(struct radeon_device *rdev); | |||
82 | bool r100_hpd_sense(struct radeon_device *rdev, enum radeon_hpd_id hpd); | 90 | bool r100_hpd_sense(struct radeon_device *rdev, enum radeon_hpd_id hpd); |
83 | void r100_hpd_set_polarity(struct radeon_device *rdev, | 91 | void r100_hpd_set_polarity(struct radeon_device *rdev, |
84 | enum radeon_hpd_id hpd); | 92 | enum radeon_hpd_id hpd); |
93 | int r100_debugfs_rbbm_init(struct radeon_device *rdev); | ||
94 | int r100_debugfs_cp_init(struct radeon_device *rdev); | ||
95 | void r100_cp_disable(struct radeon_device *rdev); | ||
96 | int r100_cp_init(struct radeon_device *rdev, unsigned ring_size); | ||
97 | void r100_cp_fini(struct radeon_device *rdev); | ||
98 | int r100_pci_gart_init(struct radeon_device *rdev); | ||
99 | void r100_pci_gart_fini(struct radeon_device *rdev); | ||
100 | int r100_pci_gart_enable(struct radeon_device *rdev); | ||
101 | void r100_pci_gart_disable(struct radeon_device *rdev); | ||
102 | int r100_debugfs_mc_info_init(struct radeon_device *rdev); | ||
103 | int r100_gui_wait_for_idle(struct radeon_device *rdev); | ||
104 | void r100_ib_fini(struct radeon_device *rdev); | ||
105 | int r100_ib_init(struct radeon_device *rdev); | ||
106 | void r100_irq_disable(struct radeon_device *rdev); | ||
107 | void r100_mc_stop(struct radeon_device *rdev, struct r100_mc_save *save); | ||
108 | void r100_mc_resume(struct radeon_device *rdev, struct r100_mc_save *save); | ||
109 | void r100_vram_init_sizes(struct radeon_device *rdev); | ||
110 | void r100_wb_disable(struct radeon_device *rdev); | ||
111 | void r100_wb_fini(struct radeon_device *rdev); | ||
112 | 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); | ||
116 | void r100_vga_render_disable(struct radeon_device *rdev); | ||
117 | int r100_cs_track_check_pkt3_indx_buffer(struct radeon_cs_parser *p, | ||
118 | struct radeon_cs_packet *pkt, | ||
119 | struct radeon_bo *robj); | ||
120 | int r100_cs_parse_packet0(struct radeon_cs_parser *p, | ||
121 | struct radeon_cs_packet *pkt, | ||
122 | const unsigned *auth, unsigned n, | ||
123 | radeon_packet0_check_t check); | ||
124 | int r100_cs_packet_parse(struct radeon_cs_parser *p, | ||
125 | struct radeon_cs_packet *pkt, | ||
126 | unsigned idx); | ||
127 | void r100_enable_bm(struct radeon_device *rdev); | ||
128 | void r100_set_common_regs(struct radeon_device *rdev); | ||
85 | 129 | ||
86 | /* | 130 | /* |
87 | * r200,rv250,rs300,rv280 | 131 | * r200,rv250,rs300,rv280 |