aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/radeon')
-rw-r--r--drivers/gpu/drm/radeon/atombios_encoders.c4
-rw-r--r--drivers/gpu/drm/radeon/evergreen.c12
-rw-r--r--drivers/gpu/drm/radeon/evergreen_cs.c2
-rw-r--r--drivers/gpu/drm/radeon/ni.c8
-rw-r--r--drivers/gpu/drm/radeon/r100.c14
-rw-r--r--drivers/gpu/drm/radeon/r300.c4
-rw-r--r--drivers/gpu/drm/radeon/r520.c4
-rw-r--r--drivers/gpu/drm/radeon/r600.c18
-rw-r--r--drivers/gpu/drm/radeon/r600_cs.c2
-rw-r--r--drivers/gpu/drm/radeon/r600_hdmi.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon_combios.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon_connectors.c28
-rw-r--r--drivers/gpu/drm/radeon/radeon_cs.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon_device.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon_fb.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon_fence.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon_ioc32.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon_legacy_crtc.c4
-rw-r--r--drivers/gpu/drm/radeon/radeon_ring.c8
-rw-r--r--drivers/gpu/drm/radeon/radeon_test.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon_ttm.c2
-rw-r--r--drivers/gpu/drm/radeon/rs400.c6
-rw-r--r--drivers/gpu/drm/radeon/rs600.c14
-rw-r--r--drivers/gpu/drm/radeon/rs690.c6
-rw-r--r--drivers/gpu/drm/radeon/rv515.c18
-rw-r--r--drivers/gpu/drm/radeon/rv770.c10
-rw-r--r--drivers/gpu/drm/radeon/si.c6
27 files changed, 93 insertions, 93 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
index dac32c8f76c4..07441cb718a3 100644
--- a/drivers/gpu/drm/radeon/atombios_encoders.c
+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
@@ -2489,7 +2489,7 @@ static const struct drm_encoder_funcs radeon_atom_enc_funcs = {
2489 .destroy = radeon_enc_destroy, 2489 .destroy = radeon_enc_destroy,
2490}; 2490};
2491 2491
2492struct radeon_encoder_atom_dac * 2492static struct radeon_encoder_atom_dac *
2493radeon_atombios_set_dac_info(struct radeon_encoder *radeon_encoder) 2493radeon_atombios_set_dac_info(struct radeon_encoder *radeon_encoder)
2494{ 2494{
2495 struct drm_device *dev = radeon_encoder->base.dev; 2495 struct drm_device *dev = radeon_encoder->base.dev;
@@ -2503,7 +2503,7 @@ radeon_atombios_set_dac_info(struct radeon_encoder *radeon_encoder)
2503 return dac; 2503 return dac;
2504} 2504}
2505 2505
2506struct radeon_encoder_atom_dig * 2506static struct radeon_encoder_atom_dig *
2507radeon_atombios_set_dig_info(struct radeon_encoder *radeon_encoder) 2507radeon_atombios_set_dig_info(struct radeon_encoder *radeon_encoder)
2508{ 2508{
2509 int encoder_enum = (radeon_encoder->encoder_enum & ENUM_ID_MASK) >> ENUM_ID_SHIFT; 2509 int encoder_enum = (radeon_encoder->encoder_enum & ENUM_ID_MASK) >> ENUM_ID_SHIFT;
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 90366e309495..ef47879c5d40 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -1121,7 +1121,7 @@ void evergreen_pcie_gart_tlb_flush(struct radeon_device *rdev)
1121 } 1121 }
1122} 1122}
1123 1123
1124int evergreen_pcie_gart_enable(struct radeon_device *rdev) 1124static int evergreen_pcie_gart_enable(struct radeon_device *rdev)
1125{ 1125{
1126 u32 tmp; 1126 u32 tmp;
1127 int r; 1127 int r;
@@ -1180,7 +1180,7 @@ int evergreen_pcie_gart_enable(struct radeon_device *rdev)
1180 return 0; 1180 return 0;
1181} 1181}
1182 1182
1183void evergreen_pcie_gart_disable(struct radeon_device *rdev) 1183static void evergreen_pcie_gart_disable(struct radeon_device *rdev)
1184{ 1184{
1185 u32 tmp; 1185 u32 tmp;
1186 1186
@@ -1205,7 +1205,7 @@ void evergreen_pcie_gart_disable(struct radeon_device *rdev)
1205 radeon_gart_table_vram_unpin(rdev); 1205 radeon_gart_table_vram_unpin(rdev);
1206} 1206}
1207 1207
1208void evergreen_pcie_gart_fini(struct radeon_device *rdev) 1208static void evergreen_pcie_gart_fini(struct radeon_device *rdev)
1209{ 1209{
1210 evergreen_pcie_gart_disable(rdev); 1210 evergreen_pcie_gart_disable(rdev);
1211 radeon_gart_table_vram_free(rdev); 1211 radeon_gart_table_vram_free(rdev);
@@ -1213,7 +1213,7 @@ void evergreen_pcie_gart_fini(struct radeon_device *rdev)
1213} 1213}
1214 1214
1215 1215
1216void evergreen_agp_enable(struct radeon_device *rdev) 1216static void evergreen_agp_enable(struct radeon_device *rdev)
1217{ 1217{
1218 u32 tmp; 1218 u32 tmp;
1219 1219
@@ -1556,7 +1556,7 @@ static int evergreen_cp_start(struct radeon_device *rdev)
1556 return 0; 1556 return 0;
1557} 1557}
1558 1558
1559int evergreen_cp_resume(struct radeon_device *rdev) 1559static int evergreen_cp_resume(struct radeon_device *rdev)
1560{ 1560{
1561 struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]; 1561 struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];
1562 u32 tmp; 1562 u32 tmp;
@@ -2709,7 +2709,7 @@ static void evergreen_irq_ack(struct radeon_device *rdev)
2709 } 2709 }
2710} 2710}
2711 2711
2712void evergreen_irq_disable(struct radeon_device *rdev) 2712static void evergreen_irq_disable(struct radeon_device *rdev)
2713{ 2713{
2714 r600_disable_interrupts(rdev); 2714 r600_disable_interrupts(rdev);
2715 /* Wait and acknowledge irq */ 2715 /* Wait and acknowledge irq */
diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c
index e44a62a07fe3..0f32ea4d608b 100644
--- a/drivers/gpu/drm/radeon/evergreen_cs.c
+++ b/drivers/gpu/drm/radeon/evergreen_cs.c
@@ -995,7 +995,7 @@ static int evergreen_cs_track_check(struct radeon_cs_parser *p)
995 * Assume that chunk_ib_index is properly set. Will return -EINVAL 995 * Assume that chunk_ib_index is properly set. Will return -EINVAL
996 * if packet is bigger than remaining ib size. or if packets is unknown. 996 * if packet is bigger than remaining ib size. or if packets is unknown.
997 **/ 997 **/
998int evergreen_cs_packet_parse(struct radeon_cs_parser *p, 998static int evergreen_cs_packet_parse(struct radeon_cs_parser *p,
999 struct radeon_cs_packet *pkt, 999 struct radeon_cs_packet *pkt,
1000 unsigned idx) 1000 unsigned idx)
1001{ 1001{
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index e09d3a84a656..b23821674a95 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -726,7 +726,7 @@ void cayman_pcie_gart_tlb_flush(struct radeon_device *rdev)
726 WREG32(VM_INVALIDATE_REQUEST, 1); 726 WREG32(VM_INVALIDATE_REQUEST, 1);
727} 727}
728 728
729int cayman_pcie_gart_enable(struct radeon_device *rdev) 729static int cayman_pcie_gart_enable(struct radeon_device *rdev)
730{ 730{
731 int i, r; 731 int i, r;
732 732
@@ -793,7 +793,7 @@ int cayman_pcie_gart_enable(struct radeon_device *rdev)
793 return 0; 793 return 0;
794} 794}
795 795
796void cayman_pcie_gart_disable(struct radeon_device *rdev) 796static void cayman_pcie_gart_disable(struct radeon_device *rdev)
797{ 797{
798 /* Disable all tables */ 798 /* Disable all tables */
799 WREG32(VM_CONTEXT0_CNTL, 0); 799 WREG32(VM_CONTEXT0_CNTL, 0);
@@ -813,7 +813,7 @@ void cayman_pcie_gart_disable(struct radeon_device *rdev)
813 radeon_gart_table_vram_unpin(rdev); 813 radeon_gart_table_vram_unpin(rdev);
814} 814}
815 815
816void cayman_pcie_gart_fini(struct radeon_device *rdev) 816static void cayman_pcie_gart_fini(struct radeon_device *rdev)
817{ 817{
818 cayman_pcie_gart_disable(rdev); 818 cayman_pcie_gart_disable(rdev);
819 radeon_gart_table_vram_free(rdev); 819 radeon_gart_table_vram_free(rdev);
@@ -1005,7 +1005,7 @@ static void cayman_cp_fini(struct radeon_device *rdev)
1005 radeon_scratch_free(rdev, ring->rptr_save_reg); 1005 radeon_scratch_free(rdev, ring->rptr_save_reg);
1006} 1006}
1007 1007
1008int cayman_cp_resume(struct radeon_device *rdev) 1008static int cayman_cp_resume(struct radeon_device *rdev)
1009{ 1009{
1010 static const int ridx[] = { 1010 static const int ridx[] = {
1011 RADEON_RING_TYPE_GFX_INDEX, 1011 RADEON_RING_TYPE_GFX_INDEX,
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index bf3d7902f5a0..cd11760f2395 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -2513,7 +2513,7 @@ void r100_cs_track_clear(struct radeon_device *rdev, struct r100_cs_track *track
2513/* 2513/*
2514 * Global GPU functions 2514 * Global GPU functions
2515 */ 2515 */
2516void r100_errata(struct radeon_device *rdev) 2516static void r100_errata(struct radeon_device *rdev)
2517{ 2517{
2518 rdev->pll_errata = 0; 2518 rdev->pll_errata = 0;
2519 2519
@@ -2529,7 +2529,7 @@ void r100_errata(struct radeon_device *rdev)
2529} 2529}
2530 2530
2531/* Wait for vertical sync on primary CRTC */ 2531/* Wait for vertical sync on primary CRTC */
2532void r100_gpu_wait_for_vsync(struct radeon_device *rdev) 2532static void r100_gpu_wait_for_vsync(struct radeon_device *rdev)
2533{ 2533{
2534 uint32_t crtc_gen_cntl, tmp; 2534 uint32_t crtc_gen_cntl, tmp;
2535 int i; 2535 int i;
@@ -2551,7 +2551,7 @@ void r100_gpu_wait_for_vsync(struct radeon_device *rdev)
2551} 2551}
2552 2552
2553/* Wait for vertical sync on secondary CRTC */ 2553/* Wait for vertical sync on secondary CRTC */
2554void r100_gpu_wait_for_vsync2(struct radeon_device *rdev) 2554static void r100_gpu_wait_for_vsync2(struct radeon_device *rdev)
2555{ 2555{
2556 uint32_t crtc2_gen_cntl, tmp; 2556 uint32_t crtc2_gen_cntl, tmp;
2557 int i; 2557 int i;
@@ -2572,7 +2572,7 @@ void r100_gpu_wait_for_vsync2(struct radeon_device *rdev)
2572 } 2572 }
2573} 2573}
2574 2574
2575int r100_rbbm_fifo_wait_for_entry(struct radeon_device *rdev, unsigned n) 2575static int r100_rbbm_fifo_wait_for_entry(struct radeon_device *rdev, unsigned n)
2576{ 2576{
2577 unsigned i; 2577 unsigned i;
2578 uint32_t tmp; 2578 uint32_t tmp;
@@ -2933,7 +2933,7 @@ void r100_vga_set_state(struct radeon_device *rdev, bool state)
2933 WREG32(RADEON_CONFIG_CNTL, temp); 2933 WREG32(RADEON_CONFIG_CNTL, temp);
2934} 2934}
2935 2935
2936void r100_mc_init(struct radeon_device *rdev) 2936static void r100_mc_init(struct radeon_device *rdev)
2937{ 2937{
2938 u64 base; 2938 u64 base;
2939 2939
@@ -3005,7 +3005,7 @@ void r100_pll_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v)
3005 r100_pll_errata_after_data(rdev); 3005 r100_pll_errata_after_data(rdev);
3006} 3006}
3007 3007
3008void r100_set_safe_registers(struct radeon_device *rdev) 3008static void r100_set_safe_registers(struct radeon_device *rdev)
3009{ 3009{
3010 if (ASIC_IS_RN50(rdev)) { 3010 if (ASIC_IS_RN50(rdev)) {
3011 rdev->config.r100.reg_safe_bm = rn50_reg_safe_bm; 3011 rdev->config.r100.reg_safe_bm = rn50_reg_safe_bm;
@@ -3947,7 +3947,7 @@ static void r100_mc_program(struct radeon_device *rdev)
3947 r100_mc_resume(rdev, &save); 3947 r100_mc_resume(rdev, &save);
3948} 3948}
3949 3949
3950void r100_clock_startup(struct radeon_device *rdev) 3950static void r100_clock_startup(struct radeon_device *rdev)
3951{ 3951{
3952 u32 tmp; 3952 u32 tmp;
3953 3953
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 646a1927dda7..4949bfc14b58 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -296,7 +296,7 @@ void r300_ring_start(struct radeon_device *rdev, struct radeon_ring *ring)
296 radeon_ring_unlock_commit(rdev, ring); 296 radeon_ring_unlock_commit(rdev, ring);
297} 297}
298 298
299void r300_errata(struct radeon_device *rdev) 299static void r300_errata(struct radeon_device *rdev)
300{ 300{
301 rdev->pll_errata = 0; 301 rdev->pll_errata = 0;
302 302
@@ -322,7 +322,7 @@ int r300_mc_wait_for_idle(struct radeon_device *rdev)
322 return -1; 322 return -1;
323} 323}
324 324
325void r300_gpu_init(struct radeon_device *rdev) 325static void r300_gpu_init(struct radeon_device *rdev)
326{ 326{
327 uint32_t gb_tile_config, tmp; 327 uint32_t gb_tile_config, tmp;
328 328
diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c
index 079d3c52c08a..28b4f871aaf4 100644
--- a/drivers/gpu/drm/radeon/r520.c
+++ b/drivers/gpu/drm/radeon/r520.c
@@ -119,7 +119,7 @@ static void r520_vram_get_type(struct radeon_device *rdev)
119 rdev->mc.vram_width *= 2; 119 rdev->mc.vram_width *= 2;
120} 120}
121 121
122void r520_mc_init(struct radeon_device *rdev) 122static void r520_mc_init(struct radeon_device *rdev)
123{ 123{
124 124
125 r520_vram_get_type(rdev); 125 r520_vram_get_type(rdev);
@@ -131,7 +131,7 @@ void r520_mc_init(struct radeon_device *rdev)
131 radeon_update_bandwidth_info(rdev); 131 radeon_update_bandwidth_info(rdev);
132} 132}
133 133
134void r520_mc_program(struct radeon_device *rdev) 134static void r520_mc_program(struct radeon_device *rdev)
135{ 135{
136 struct rv515_mc_save save; 136 struct rv515_mc_save save;
137 137
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index fd4289bb78d9..48460b4b3e2e 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -98,7 +98,7 @@ int r600_debugfs_mc_info_init(struct radeon_device *rdev);
98 98
99/* r600,rv610,rv630,rv620,rv635,rv670 */ 99/* r600,rv610,rv630,rv620,rv635,rv670 */
100int r600_mc_wait_for_idle(struct radeon_device *rdev); 100int r600_mc_wait_for_idle(struct radeon_device *rdev);
101void r600_gpu_init(struct radeon_device *rdev); 101static void r600_gpu_init(struct radeon_device *rdev);
102void r600_fini(struct radeon_device *rdev); 102void r600_fini(struct radeon_device *rdev);
103void r600_irq_disable(struct radeon_device *rdev); 103void r600_irq_disable(struct radeon_device *rdev);
104static void r600_pcie_gen2_enable(struct radeon_device *rdev); 104static void r600_pcie_gen2_enable(struct radeon_device *rdev);
@@ -881,7 +881,7 @@ int r600_pcie_gart_init(struct radeon_device *rdev)
881 return radeon_gart_table_vram_alloc(rdev); 881 return radeon_gart_table_vram_alloc(rdev);
882} 882}
883 883
884int r600_pcie_gart_enable(struct radeon_device *rdev) 884static int r600_pcie_gart_enable(struct radeon_device *rdev)
885{ 885{
886 u32 tmp; 886 u32 tmp;
887 int r, i; 887 int r, i;
@@ -938,7 +938,7 @@ int r600_pcie_gart_enable(struct radeon_device *rdev)
938 return 0; 938 return 0;
939} 939}
940 940
941void r600_pcie_gart_disable(struct radeon_device *rdev) 941static void r600_pcie_gart_disable(struct radeon_device *rdev)
942{ 942{
943 u32 tmp; 943 u32 tmp;
944 int i; 944 int i;
@@ -971,14 +971,14 @@ void r600_pcie_gart_disable(struct radeon_device *rdev)
971 radeon_gart_table_vram_unpin(rdev); 971 radeon_gart_table_vram_unpin(rdev);
972} 972}
973 973
974void r600_pcie_gart_fini(struct radeon_device *rdev) 974static void r600_pcie_gart_fini(struct radeon_device *rdev)
975{ 975{
976 radeon_gart_fini(rdev); 976 radeon_gart_fini(rdev);
977 r600_pcie_gart_disable(rdev); 977 r600_pcie_gart_disable(rdev);
978 radeon_gart_table_vram_free(rdev); 978 radeon_gart_table_vram_free(rdev);
979} 979}
980 980
981void r600_agp_enable(struct radeon_device *rdev) 981static void r600_agp_enable(struct radeon_device *rdev)
982{ 982{
983 u32 tmp; 983 u32 tmp;
984 int i; 984 int i;
@@ -1158,7 +1158,7 @@ static void r600_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc
1158 } 1158 }
1159} 1159}
1160 1160
1161int r600_mc_init(struct radeon_device *rdev) 1161static int r600_mc_init(struct radeon_device *rdev)
1162{ 1162{
1163 u32 tmp; 1163 u32 tmp;
1164 int chansize, numchan; 1164 int chansize, numchan;
@@ -1258,7 +1258,7 @@ void r600_vram_scratch_fini(struct radeon_device *rdev)
1258 * reset, it's up to the caller to determine if the GPU needs one. We 1258 * reset, it's up to the caller to determine if the GPU needs one. We
1259 * might add an helper function to check that. 1259 * might add an helper function to check that.
1260 */ 1260 */
1261int r600_gpu_soft_reset(struct radeon_device *rdev) 1261static int r600_gpu_soft_reset(struct radeon_device *rdev)
1262{ 1262{
1263 struct rv515_mc_save save; 1263 struct rv515_mc_save save;
1264 u32 grbm_busy_mask = S_008010_VC_BUSY(1) | S_008010_VGT_BUSY_NO_DMA(1) | 1264 u32 grbm_busy_mask = S_008010_VC_BUSY(1) | S_008010_VGT_BUSY_NO_DMA(1) |
@@ -1433,7 +1433,7 @@ int r600_count_pipe_bits(uint32_t val)
1433 return ret; 1433 return ret;
1434} 1434}
1435 1435
1436void r600_gpu_init(struct radeon_device *rdev) 1436static void r600_gpu_init(struct radeon_device *rdev)
1437{ 1437{
1438 u32 tiling_config; 1438 u32 tiling_config;
1439 u32 ramcfg; 1439 u32 ramcfg;
@@ -2347,7 +2347,7 @@ void r600_clear_surface_reg(struct radeon_device *rdev, int reg)
2347 /* FIXME: implement */ 2347 /* FIXME: implement */
2348} 2348}
2349 2349
2350int r600_startup(struct radeon_device *rdev) 2350static int r600_startup(struct radeon_device *rdev)
2351{ 2351{
2352 struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]; 2352 struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];
2353 int r; 2353 int r;
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
index f37676d7f217..32fbdf9ff265 100644
--- a/drivers/gpu/drm/radeon/r600_cs.c
+++ b/drivers/gpu/drm/radeon/r600_cs.c
@@ -847,7 +847,7 @@ static int r600_cs_track_check(struct radeon_cs_parser *p)
847 * Assume that chunk_ib_index is properly set. Will return -EINVAL 847 * Assume that chunk_ib_index is properly set. Will return -EINVAL
848 * if packet is bigger than remaining ib size. or if packets is unknown. 848 * if packet is bigger than remaining ib size. or if packets is unknown.
849 **/ 849 **/
850int r600_cs_packet_parse(struct radeon_cs_parser *p, 850static int r600_cs_packet_parse(struct radeon_cs_parser *p,
851 struct radeon_cs_packet *pkt, 851 struct radeon_cs_packet *pkt,
852 unsigned idx) 852 unsigned idx)
853{ 853{
diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
index e3558c3ef24a..857a7d7862fb 100644
--- a/drivers/gpu/drm/radeon/r600_hdmi.c
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
@@ -53,7 +53,7 @@ enum r600_hdmi_iec_status_bits {
53 AUDIO_STATUS_LEVEL = 0x80 53 AUDIO_STATUS_LEVEL = 0x80
54}; 54};
55 55
56struct radeon_hdmi_acr r600_hdmi_predefined_acr[] = { 56static const struct radeon_hdmi_acr r600_hdmi_predefined_acr[] = {
57 /* 32kHz 44.1kHz 48kHz */ 57 /* 32kHz 44.1kHz 48kHz */
58 /* Clock N CTS N CTS N CTS */ 58 /* Clock N CTS N CTS N CTS */
59 { 25174, 4576, 28125, 7007, 31250, 6864, 28125 }, /* 25,20/1.001 MHz */ 59 { 25174, 4576, 28125, 7007, 31250, 6864, 28125 }, /* 25,20/1.001 MHz */
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index f75247d42ffd..854d1e230369 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -3319,7 +3319,7 @@ static void combios_write_ram_size(struct drm_device *dev)
3319 WREG32(RADEON_CONFIG_MEMSIZE, mem_size); 3319 WREG32(RADEON_CONFIG_MEMSIZE, mem_size);
3320} 3320}
3321 3321
3322void radeon_combios_dyn_clk_setup(struct drm_device *dev, int enable) 3322static void radeon_combios_dyn_clk_setup(struct drm_device *dev, int enable)
3323{ 3323{
3324 uint16_t dyn_clk_info = 3324 uint16_t dyn_clk_info =
3325 combios_get_table_offset(dev, COMBIOS_DYN_CLK_1_TABLE); 3325 combios_get_table_offset(dev, COMBIOS_DYN_CLK_1_TABLE);
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 748c5f229c28..69a142fc3d1d 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -194,7 +194,7 @@ radeon_connector_update_scratch_regs(struct drm_connector *connector, enum drm_c
194 } 194 }
195} 195}
196 196
197struct drm_encoder *radeon_find_encoder(struct drm_connector *connector, int encoder_type) 197static struct drm_encoder *radeon_find_encoder(struct drm_connector *connector, int encoder_type)
198{ 198{
199 struct drm_mode_object *obj; 199 struct drm_mode_object *obj;
200 struct drm_encoder *encoder; 200 struct drm_encoder *encoder;
@@ -215,7 +215,7 @@ struct drm_encoder *radeon_find_encoder(struct drm_connector *connector, int enc
215 return NULL; 215 return NULL;
216} 216}
217 217
218struct drm_encoder *radeon_best_single_encoder(struct drm_connector *connector) 218static struct drm_encoder *radeon_best_single_encoder(struct drm_connector *connector)
219{ 219{
220 int enc_id = connector->encoder_ids[0]; 220 int enc_id = connector->encoder_ids[0];
221 struct drm_mode_object *obj; 221 struct drm_mode_object *obj;
@@ -366,7 +366,7 @@ static void radeon_add_common_modes(struct drm_encoder *encoder, struct drm_conn
366 } 366 }
367} 367}
368 368
369int radeon_connector_set_property(struct drm_connector *connector, struct drm_property *property, 369static int radeon_connector_set_property(struct drm_connector *connector, struct drm_property *property,
370 uint64_t val) 370 uint64_t val)
371{ 371{
372 struct drm_device *dev = connector->dev; 372 struct drm_device *dev = connector->dev;
@@ -687,13 +687,13 @@ static int radeon_lvds_set_property(struct drm_connector *connector,
687} 687}
688 688
689 689
690struct drm_connector_helper_funcs radeon_lvds_connector_helper_funcs = { 690static const struct drm_connector_helper_funcs radeon_lvds_connector_helper_funcs = {
691 .get_modes = radeon_lvds_get_modes, 691 .get_modes = radeon_lvds_get_modes,
692 .mode_valid = radeon_lvds_mode_valid, 692 .mode_valid = radeon_lvds_mode_valid,
693 .best_encoder = radeon_best_single_encoder, 693 .best_encoder = radeon_best_single_encoder,
694}; 694};
695 695
696struct drm_connector_funcs radeon_lvds_connector_funcs = { 696static const struct drm_connector_funcs radeon_lvds_connector_funcs = {
697 .dpms = drm_helper_connector_dpms, 697 .dpms = drm_helper_connector_dpms,
698 .detect = radeon_lvds_detect, 698 .detect = radeon_lvds_detect,
699 .fill_modes = drm_helper_probe_single_connector_modes, 699 .fill_modes = drm_helper_probe_single_connector_modes,
@@ -805,13 +805,13 @@ radeon_vga_detect(struct drm_connector *connector, bool force)
805 return ret; 805 return ret;
806} 806}
807 807
808struct drm_connector_helper_funcs radeon_vga_connector_helper_funcs = { 808static const struct drm_connector_helper_funcs radeon_vga_connector_helper_funcs = {
809 .get_modes = radeon_vga_get_modes, 809 .get_modes = radeon_vga_get_modes,
810 .mode_valid = radeon_vga_mode_valid, 810 .mode_valid = radeon_vga_mode_valid,
811 .best_encoder = radeon_best_single_encoder, 811 .best_encoder = radeon_best_single_encoder,
812}; 812};
813 813
814struct drm_connector_funcs radeon_vga_connector_funcs = { 814static const struct drm_connector_funcs radeon_vga_connector_funcs = {
815 .dpms = drm_helper_connector_dpms, 815 .dpms = drm_helper_connector_dpms,
816 .detect = radeon_vga_detect, 816 .detect = radeon_vga_detect,
817 .fill_modes = drm_helper_probe_single_connector_modes, 817 .fill_modes = drm_helper_probe_single_connector_modes,
@@ -875,13 +875,13 @@ radeon_tv_detect(struct drm_connector *connector, bool force)
875 return ret; 875 return ret;
876} 876}
877 877
878struct drm_connector_helper_funcs radeon_tv_connector_helper_funcs = { 878static const struct drm_connector_helper_funcs radeon_tv_connector_helper_funcs = {
879 .get_modes = radeon_tv_get_modes, 879 .get_modes = radeon_tv_get_modes,
880 .mode_valid = radeon_tv_mode_valid, 880 .mode_valid = radeon_tv_mode_valid,
881 .best_encoder = radeon_best_single_encoder, 881 .best_encoder = radeon_best_single_encoder,
882}; 882};
883 883
884struct drm_connector_funcs radeon_tv_connector_funcs = { 884static const struct drm_connector_funcs radeon_tv_connector_funcs = {
885 .dpms = drm_helper_connector_dpms, 885 .dpms = drm_helper_connector_dpms,
886 .detect = radeon_tv_detect, 886 .detect = radeon_tv_detect,
887 .fill_modes = drm_helper_probe_single_connector_modes, 887 .fill_modes = drm_helper_probe_single_connector_modes,
@@ -1085,7 +1085,7 @@ out:
1085} 1085}
1086 1086
1087/* okay need to be smart in here about which encoder to pick */ 1087/* okay need to be smart in here about which encoder to pick */
1088struct drm_encoder *radeon_dvi_encoder(struct drm_connector *connector) 1088static struct drm_encoder *radeon_dvi_encoder(struct drm_connector *connector)
1089{ 1089{
1090 int enc_id = connector->encoder_ids[0]; 1090 int enc_id = connector->encoder_ids[0];
1091 struct radeon_connector *radeon_connector = to_radeon_connector(connector); 1091 struct radeon_connector *radeon_connector = to_radeon_connector(connector);
@@ -1175,13 +1175,13 @@ static int radeon_dvi_mode_valid(struct drm_connector *connector,
1175 return MODE_OK; 1175 return MODE_OK;
1176} 1176}
1177 1177
1178struct drm_connector_helper_funcs radeon_dvi_connector_helper_funcs = { 1178static const struct drm_connector_helper_funcs radeon_dvi_connector_helper_funcs = {
1179 .get_modes = radeon_dvi_get_modes, 1179 .get_modes = radeon_dvi_get_modes,
1180 .mode_valid = radeon_dvi_mode_valid, 1180 .mode_valid = radeon_dvi_mode_valid,
1181 .best_encoder = radeon_dvi_encoder, 1181 .best_encoder = radeon_dvi_encoder,
1182}; 1182};
1183 1183
1184struct drm_connector_funcs radeon_dvi_connector_funcs = { 1184static const struct drm_connector_funcs radeon_dvi_connector_funcs = {
1185 .dpms = drm_helper_connector_dpms, 1185 .dpms = drm_helper_connector_dpms,
1186 .detect = radeon_dvi_detect, 1186 .detect = radeon_dvi_detect,
1187 .fill_modes = drm_helper_probe_single_connector_modes, 1187 .fill_modes = drm_helper_probe_single_connector_modes,
@@ -1458,13 +1458,13 @@ static int radeon_dp_mode_valid(struct drm_connector *connector,
1458 } 1458 }
1459} 1459}
1460 1460
1461struct drm_connector_helper_funcs radeon_dp_connector_helper_funcs = { 1461static const struct drm_connector_helper_funcs radeon_dp_connector_helper_funcs = {
1462 .get_modes = radeon_dp_get_modes, 1462 .get_modes = radeon_dp_get_modes,
1463 .mode_valid = radeon_dp_mode_valid, 1463 .mode_valid = radeon_dp_mode_valid,
1464 .best_encoder = radeon_dvi_encoder, 1464 .best_encoder = radeon_dvi_encoder,
1465}; 1465};
1466 1466
1467struct drm_connector_funcs radeon_dp_connector_funcs = { 1467static const struct drm_connector_funcs radeon_dp_connector_funcs = {
1468 .dpms = drm_helper_connector_dpms, 1468 .dpms = drm_helper_connector_dpms,
1469 .detect = radeon_dp_detect, 1469 .detect = radeon_dp_detect,
1470 .fill_modes = drm_helper_probe_single_connector_modes, 1470 .fill_modes = drm_helper_probe_single_connector_modes,
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 3ae7c27c9d6c..e24150659bc7 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -32,7 +32,7 @@
32void r100_cs_dump_packet(struct radeon_cs_parser *p, 32void r100_cs_dump_packet(struct radeon_cs_parser *p,
33 struct radeon_cs_packet *pkt); 33 struct radeon_cs_packet *pkt);
34 34
35int radeon_cs_parser_relocs(struct radeon_cs_parser *p) 35static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
36{ 36{
37 struct drm_device *ddev = p->rdev->ddev; 37 struct drm_device *ddev = p->rdev->ddev;
38 struct radeon_cs_chunk *chunk; 38 struct radeon_cs_chunk *chunk;
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 331a952c9b53..6fca11c64dcd 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -842,7 +842,7 @@ static unsigned int radeon_vga_set_decode(void *cookie, bool state)
842 * Validates certain module parameters and updates 842 * Validates certain module parameters and updates
843 * the associated values used by the driver (all asics). 843 * the associated values used by the driver (all asics).
844 */ 844 */
845void radeon_check_arguments(struct radeon_device *rdev) 845static void radeon_check_arguments(struct radeon_device *rdev)
846{ 846{
847 /* vramlimit must be a power of two */ 847 /* vramlimit must be a power of two */
848 switch (radeon_vram_limit) { 848 switch (radeon_vram_limit) {
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index 5906914a78bc..8b088ca12095 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -317,7 +317,7 @@ static int radeon_fb_find_or_create_single(struct drm_fb_helper *helper,
317} 317}
318 318
319static char *mode_option; 319static char *mode_option;
320int radeon_parse_options(char *options) 320static int radeon_parse_options(char *options)
321{ 321{
322 char *this_opt; 322 char *this_opt;
323 323
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
index 2a59375dbe52..1eb3db52a36e 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -399,7 +399,7 @@ int radeon_fence_wait(struct radeon_fence *fence, bool intr)
399 return 0; 399 return 0;
400} 400}
401 401
402bool radeon_fence_any_seq_signaled(struct radeon_device *rdev, u64 *seq) 402static bool radeon_fence_any_seq_signaled(struct radeon_device *rdev, u64 *seq)
403{ 403{
404 unsigned i; 404 unsigned i;
405 405
diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
index 48b7cea31e08..c4bb2269be10 100644
--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
@@ -369,7 +369,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
369#define compat_radeon_cp_setparam NULL 369#define compat_radeon_cp_setparam NULL
370#endif /* X86_64 || IA64 */ 370#endif /* X86_64 || IA64 */
371 371
372drm_ioctl_compat_t *radeon_compat_ioctls[] = { 372static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
373 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init, 373 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
374 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear, 374 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
375 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple, 375 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
index 94b4a1c12893..e946bfcf25b5 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
@@ -206,7 +206,7 @@ static void radeon_legacy_rmx_mode_set(struct drm_crtc *crtc,
206 WREG32(RADEON_FP_CRTC_V_TOTAL_DISP, fp_crtc_v_total_disp); 206 WREG32(RADEON_FP_CRTC_V_TOTAL_DISP, fp_crtc_v_total_disp);
207} 207}
208 208
209void radeon_restore_common_regs(struct drm_device *dev) 209static void radeon_restore_common_regs(struct drm_device *dev)
210{ 210{
211 /* don't need this yet */ 211 /* don't need this yet */
212} 212}
@@ -295,7 +295,7 @@ static uint8_t radeon_compute_pll_gain(uint16_t ref_freq, uint16_t ref_div,
295 return 1; 295 return 1;
296} 296}
297 297
298void radeon_crtc_dpms(struct drm_crtc *crtc, int mode) 298static void radeon_crtc_dpms(struct drm_crtc *crtc, int mode)
299{ 299{
300 struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); 300 struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
301 struct drm_device *dev = crtc->dev; 301 struct drm_device *dev = crtc->dev;
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index b4df25e2ac88..993cf712074f 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -43,7 +43,7 @@
43 * produce command buffers which are send to the kernel and 43 * produce command buffers which are send to the kernel and
44 * put in IBs for execution by the requested ring. 44 * put in IBs for execution by the requested ring.
45 */ 45 */
46int radeon_debugfs_sa_init(struct radeon_device *rdev); 46static int radeon_debugfs_sa_init(struct radeon_device *rdev);
47 47
48/** 48/**
49 * radeon_ib_get - request an IB (Indirect Buffer) 49 * radeon_ib_get - request an IB (Indirect Buffer)
@@ -291,7 +291,7 @@ int radeon_ib_ring_tests(struct radeon_device *rdev)
291 * wptr. The GPU then starts fetching commands and executes 291 * wptr. The GPU then starts fetching commands and executes
292 * them until the pointers are equal again. 292 * them until the pointers are equal again.
293 */ 293 */
294int radeon_debugfs_ring_init(struct radeon_device *rdev, struct radeon_ring *ring); 294static int radeon_debugfs_ring_init(struct radeon_device *rdev, struct radeon_ring *ring);
295 295
296/** 296/**
297 * radeon_ring_write - write a value to the ring 297 * radeon_ring_write - write a value to the ring
@@ -819,7 +819,7 @@ static struct drm_info_list radeon_debugfs_sa_list[] = {
819 819
820#endif 820#endif
821 821
822int radeon_debugfs_ring_init(struct radeon_device *rdev, struct radeon_ring *ring) 822static int radeon_debugfs_ring_init(struct radeon_device *rdev, struct radeon_ring *ring)
823{ 823{
824#if defined(CONFIG_DEBUG_FS) 824#if defined(CONFIG_DEBUG_FS)
825 unsigned i; 825 unsigned i;
@@ -839,7 +839,7 @@ int radeon_debugfs_ring_init(struct radeon_device *rdev, struct radeon_ring *rin
839 return 0; 839 return 0;
840} 840}
841 841
842int radeon_debugfs_sa_init(struct radeon_device *rdev) 842static int radeon_debugfs_sa_init(struct radeon_device *rdev)
843{ 843{
844#if defined(CONFIG_DEBUG_FS) 844#if defined(CONFIG_DEBUG_FS)
845 return radeon_debugfs_add_files(rdev, radeon_debugfs_sa_list, 1); 845 return radeon_debugfs_add_files(rdev, radeon_debugfs_sa_list, 1);
diff --git a/drivers/gpu/drm/radeon/radeon_test.c b/drivers/gpu/drm/radeon/radeon_test.c
index 7c16540c10ff..587c09a00ba2 100644
--- a/drivers/gpu/drm/radeon/radeon_test.c
+++ b/drivers/gpu/drm/radeon/radeon_test.c
@@ -313,7 +313,7 @@ out_cleanup:
313 printk(KERN_WARNING "Error while testing ring sync (%d).\n", r); 313 printk(KERN_WARNING "Error while testing ring sync (%d).\n", r);
314} 314}
315 315
316void radeon_test_ring_sync2(struct radeon_device *rdev, 316static void radeon_test_ring_sync2(struct radeon_device *rdev,
317 struct radeon_ring *ringA, 317 struct radeon_ring *ringA,
318 struct radeon_ring *ringB, 318 struct radeon_ring *ringB,
319 struct radeon_ring *ringC) 319 struct radeon_ring *ringC)
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 5b71c716d83f..5ebe1b3e5db2 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -549,7 +549,7 @@ static struct ttm_backend_func radeon_backend_func = {
549 .destroy = &radeon_ttm_backend_destroy, 549 .destroy = &radeon_ttm_backend_destroy,
550}; 550};
551 551
552struct ttm_tt *radeon_ttm_tt_create(struct ttm_bo_device *bdev, 552static struct ttm_tt *radeon_ttm_tt_create(struct ttm_bo_device *bdev,
553 unsigned long size, uint32_t page_flags, 553 unsigned long size, uint32_t page_flags,
554 struct page *dummy_read_page) 554 struct page *dummy_read_page)
555{ 555{
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
index 2752f7f78237..73051ce3121e 100644
--- a/drivers/gpu/drm/radeon/rs400.c
+++ b/drivers/gpu/drm/radeon/rs400.c
@@ -242,7 +242,7 @@ int rs400_mc_wait_for_idle(struct radeon_device *rdev)
242 return -1; 242 return -1;
243} 243}
244 244
245void rs400_gpu_init(struct radeon_device *rdev) 245static void rs400_gpu_init(struct radeon_device *rdev)
246{ 246{
247 /* FIXME: is this correct ? */ 247 /* FIXME: is this correct ? */
248 r420_pipes_init(rdev); 248 r420_pipes_init(rdev);
@@ -252,7 +252,7 @@ void rs400_gpu_init(struct radeon_device *rdev)
252 } 252 }
253} 253}
254 254
255void rs400_mc_init(struct radeon_device *rdev) 255static void rs400_mc_init(struct radeon_device *rdev)
256{ 256{
257 u64 base; 257 u64 base;
258 258
@@ -370,7 +370,7 @@ static int rs400_debugfs_pcie_gart_info_init(struct radeon_device *rdev)
370#endif 370#endif
371} 371}
372 372
373void rs400_mc_program(struct radeon_device *rdev) 373static void rs400_mc_program(struct radeon_device *rdev)
374{ 374{
375 struct r100_mc_save save; 375 struct r100_mc_save save;
376 376
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index 8f7064492e4b..dc8d021a999b 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -43,7 +43,7 @@
43 43
44#include "rs600_reg_safe.h" 44#include "rs600_reg_safe.h"
45 45
46void rs600_gpu_init(struct radeon_device *rdev); 46static void rs600_gpu_init(struct radeon_device *rdev);
47int rs600_mc_wait_for_idle(struct radeon_device *rdev); 47int rs600_mc_wait_for_idle(struct radeon_device *rdev);
48 48
49static const u32 crtc_offsets[2] = 49static const u32 crtc_offsets[2] =
@@ -432,7 +432,7 @@ void rs600_gart_tlb_flush(struct radeon_device *rdev)
432 tmp = RREG32_MC(R_000100_MC_PT0_CNTL); 432 tmp = RREG32_MC(R_000100_MC_PT0_CNTL);
433} 433}
434 434
435int rs600_gart_init(struct radeon_device *rdev) 435static int rs600_gart_init(struct radeon_device *rdev)
436{ 436{
437 int r; 437 int r;
438 438
@@ -514,7 +514,7 @@ static int rs600_gart_enable(struct radeon_device *rdev)
514 return 0; 514 return 0;
515} 515}
516 516
517void rs600_gart_disable(struct radeon_device *rdev) 517static void rs600_gart_disable(struct radeon_device *rdev)
518{ 518{
519 u32 tmp; 519 u32 tmp;
520 520
@@ -525,7 +525,7 @@ void rs600_gart_disable(struct radeon_device *rdev)
525 radeon_gart_table_vram_unpin(rdev); 525 radeon_gart_table_vram_unpin(rdev);
526} 526}
527 527
528void rs600_gart_fini(struct radeon_device *rdev) 528static void rs600_gart_fini(struct radeon_device *rdev)
529{ 529{
530 radeon_gart_fini(rdev); 530 radeon_gart_fini(rdev);
531 rs600_gart_disable(rdev); 531 rs600_gart_disable(rdev);
@@ -753,7 +753,7 @@ int rs600_mc_wait_for_idle(struct radeon_device *rdev)
753 return -1; 753 return -1;
754} 754}
755 755
756void rs600_gpu_init(struct radeon_device *rdev) 756static void rs600_gpu_init(struct radeon_device *rdev)
757{ 757{
758 r420_pipes_init(rdev); 758 r420_pipes_init(rdev);
759 /* Wait for mc idle */ 759 /* Wait for mc idle */
@@ -761,7 +761,7 @@ void rs600_gpu_init(struct radeon_device *rdev)
761 dev_warn(rdev->dev, "Wait MC idle timeout before updating MC.\n"); 761 dev_warn(rdev->dev, "Wait MC idle timeout before updating MC.\n");
762} 762}
763 763
764void rs600_mc_init(struct radeon_device *rdev) 764static void rs600_mc_init(struct radeon_device *rdev)
765{ 765{
766 u64 base; 766 u64 base;
767 767
@@ -823,7 +823,7 @@ void rs600_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v)
823 WREG32(R_000074_MC_IND_DATA, v); 823 WREG32(R_000074_MC_IND_DATA, v);
824} 824}
825 825
826void rs600_debugfs(struct radeon_device *rdev) 826static void rs600_debugfs(struct radeon_device *rdev)
827{ 827{
828 if (r100_debugfs_rbbm_init(rdev)) 828 if (r100_debugfs_rbbm_init(rdev))
829 DRM_ERROR("Failed to register debugfs file for RBBM !\n"); 829 DRM_ERROR("Failed to register debugfs file for RBBM !\n");
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
index 3b663fcfe061..5cd5aceb69fa 100644
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c
@@ -145,7 +145,7 @@ void rs690_pm_info(struct radeon_device *rdev)
145 rdev->pm.sideport_bandwidth.full = dfixed_div(rdev->pm.sideport_bandwidth, tmp); 145 rdev->pm.sideport_bandwidth.full = dfixed_div(rdev->pm.sideport_bandwidth, tmp);
146} 146}
147 147
148void rs690_mc_init(struct radeon_device *rdev) 148static void rs690_mc_init(struct radeon_device *rdev)
149{ 149{
150 u64 base; 150 u64 base;
151 151
@@ -224,7 +224,7 @@ struct rs690_watermark {
224 fixed20_12 sclk; 224 fixed20_12 sclk;
225}; 225};
226 226
227void rs690_crtc_bandwidth_compute(struct radeon_device *rdev, 227static void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
228 struct radeon_crtc *crtc, 228 struct radeon_crtc *crtc,
229 struct rs690_watermark *wm) 229 struct rs690_watermark *wm)
230{ 230{
@@ -581,7 +581,7 @@ void rs690_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v)
581 WREG32(R_000078_MC_INDEX, 0x7F); 581 WREG32(R_000078_MC_INDEX, 0x7F);
582} 582}
583 583
584void rs690_mc_program(struct radeon_device *rdev) 584static void rs690_mc_program(struct radeon_device *rdev)
585{ 585{
586 struct rv515_mc_save save; 586 struct rv515_mc_save save;
587 587
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
index aa8ef491ef3c..2d75d30be5b4 100644
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c
@@ -35,9 +35,9 @@
35#include "rv515_reg_safe.h" 35#include "rv515_reg_safe.h"
36 36
37/* This files gather functions specifics to: rv515 */ 37/* This files gather functions specifics to: rv515 */
38int rv515_debugfs_pipes_info_init(struct radeon_device *rdev); 38static int rv515_debugfs_pipes_info_init(struct radeon_device *rdev);
39int rv515_debugfs_ga_info_init(struct radeon_device *rdev); 39static int rv515_debugfs_ga_info_init(struct radeon_device *rdev);
40void rv515_gpu_init(struct radeon_device *rdev); 40static void rv515_gpu_init(struct radeon_device *rdev);
41int rv515_mc_wait_for_idle(struct radeon_device *rdev); 41int rv515_mc_wait_for_idle(struct radeon_device *rdev);
42 42
43void rv515_debugfs(struct radeon_device *rdev) 43void rv515_debugfs(struct radeon_device *rdev)
@@ -143,7 +143,7 @@ void rv515_vga_render_disable(struct radeon_device *rdev)
143 RREG32(R_000300_VGA_RENDER_CONTROL) & C_000300_VGA_VSTATUS_CNTL); 143 RREG32(R_000300_VGA_RENDER_CONTROL) & C_000300_VGA_VSTATUS_CNTL);
144} 144}
145 145
146void rv515_gpu_init(struct radeon_device *rdev) 146static void rv515_gpu_init(struct radeon_device *rdev)
147{ 147{
148 unsigned pipe_select_current, gb_pipe_select, tmp; 148 unsigned pipe_select_current, gb_pipe_select, tmp;
149 149
@@ -189,7 +189,7 @@ static void rv515_vram_get_type(struct radeon_device *rdev)
189 } 189 }
190} 190}
191 191
192void rv515_mc_init(struct radeon_device *rdev) 192static void rv515_mc_init(struct radeon_device *rdev)
193{ 193{
194 194
195 rv515_vram_get_type(rdev); 195 rv515_vram_get_type(rdev);
@@ -261,7 +261,7 @@ static struct drm_info_list rv515_ga_info_list[] = {
261}; 261};
262#endif 262#endif
263 263
264int rv515_debugfs_pipes_info_init(struct radeon_device *rdev) 264static int rv515_debugfs_pipes_info_init(struct radeon_device *rdev)
265{ 265{
266#if defined(CONFIG_DEBUG_FS) 266#if defined(CONFIG_DEBUG_FS)
267 return radeon_debugfs_add_files(rdev, rv515_pipes_info_list, 1); 267 return radeon_debugfs_add_files(rdev, rv515_pipes_info_list, 1);
@@ -270,7 +270,7 @@ int rv515_debugfs_pipes_info_init(struct radeon_device *rdev)
270#endif 270#endif
271} 271}
272 272
273int rv515_debugfs_ga_info_init(struct radeon_device *rdev) 273static int rv515_debugfs_ga_info_init(struct radeon_device *rdev)
274{ 274{
275#if defined(CONFIG_DEBUG_FS) 275#if defined(CONFIG_DEBUG_FS)
276 return radeon_debugfs_add_files(rdev, rv515_ga_info_list, 1); 276 return radeon_debugfs_add_files(rdev, rv515_ga_info_list, 1);
@@ -310,7 +310,7 @@ void rv515_mc_resume(struct radeon_device *rdev, struct rv515_mc_save *save)
310 WREG32(R_000300_VGA_RENDER_CONTROL, save->vga_render_control); 310 WREG32(R_000300_VGA_RENDER_CONTROL, save->vga_render_control);
311} 311}
312 312
313void rv515_mc_program(struct radeon_device *rdev) 313static void rv515_mc_program(struct radeon_device *rdev)
314{ 314{
315 struct rv515_mc_save save; 315 struct rv515_mc_save save;
316 316
@@ -787,7 +787,7 @@ struct rv515_watermark {
787 fixed20_12 sclk; 787 fixed20_12 sclk;
788}; 788};
789 789
790void rv515_crtc_bandwidth_compute(struct radeon_device *rdev, 790static void rv515_crtc_bandwidth_compute(struct radeon_device *rdev,
791 struct radeon_crtc *crtc, 791 struct radeon_crtc *crtc,
792 struct rv515_watermark *wm) 792 struct rv515_watermark *wm)
793{ 793{
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index ca8ffec10ff6..2469afe11b85 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -124,7 +124,7 @@ void rv770_pm_misc(struct radeon_device *rdev)
124/* 124/*
125 * GART 125 * GART
126 */ 126 */
127int rv770_pcie_gart_enable(struct radeon_device *rdev) 127static int rv770_pcie_gart_enable(struct radeon_device *rdev)
128{ 128{
129 u32 tmp; 129 u32 tmp;
130 int r, i; 130 int r, i;
@@ -175,7 +175,7 @@ int rv770_pcie_gart_enable(struct radeon_device *rdev)
175 return 0; 175 return 0;
176} 176}
177 177
178void rv770_pcie_gart_disable(struct radeon_device *rdev) 178static void rv770_pcie_gart_disable(struct radeon_device *rdev)
179{ 179{
180 u32 tmp; 180 u32 tmp;
181 int i; 181 int i;
@@ -201,7 +201,7 @@ void rv770_pcie_gart_disable(struct radeon_device *rdev)
201 radeon_gart_table_vram_unpin(rdev); 201 radeon_gart_table_vram_unpin(rdev);
202} 202}
203 203
204void rv770_pcie_gart_fini(struct radeon_device *rdev) 204static void rv770_pcie_gart_fini(struct radeon_device *rdev)
205{ 205{
206 radeon_gart_fini(rdev); 206 radeon_gart_fini(rdev);
207 rv770_pcie_gart_disable(rdev); 207 rv770_pcie_gart_disable(rdev);
@@ -209,7 +209,7 @@ void rv770_pcie_gart_fini(struct radeon_device *rdev)
209} 209}
210 210
211 211
212void rv770_agp_enable(struct radeon_device *rdev) 212static void rv770_agp_enable(struct radeon_device *rdev)
213{ 213{
214 u32 tmp; 214 u32 tmp;
215 int i; 215 int i;
@@ -839,7 +839,7 @@ void r700_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc)
839 } 839 }
840} 840}
841 841
842int rv770_mc_init(struct radeon_device *rdev) 842static int rv770_mc_init(struct radeon_device *rdev)
843{ 843{
844 u32 tmp; 844 u32 tmp;
845 int chansize, numchan; 845 int chansize, numchan;
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index 51a471dc319c..2a5c337715de 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -2364,7 +2364,7 @@ void si_pcie_gart_tlb_flush(struct radeon_device *rdev)
2364 WREG32(VM_INVALIDATE_REQUEST, 1); 2364 WREG32(VM_INVALIDATE_REQUEST, 1);
2365} 2365}
2366 2366
2367int si_pcie_gart_enable(struct radeon_device *rdev) 2367static int si_pcie_gart_enable(struct radeon_device *rdev)
2368{ 2368{
2369 int r, i; 2369 int r, i;
2370 2370
@@ -2437,7 +2437,7 @@ int si_pcie_gart_enable(struct radeon_device *rdev)
2437 return 0; 2437 return 0;
2438} 2438}
2439 2439
2440void si_pcie_gart_disable(struct radeon_device *rdev) 2440static void si_pcie_gart_disable(struct radeon_device *rdev)
2441{ 2441{
2442 /* Disable all tables */ 2442 /* Disable all tables */
2443 WREG32(VM_CONTEXT0_CNTL, 0); 2443 WREG32(VM_CONTEXT0_CNTL, 0);
@@ -2456,7 +2456,7 @@ void si_pcie_gart_disable(struct radeon_device *rdev)
2456 radeon_gart_table_vram_unpin(rdev); 2456 radeon_gart_table_vram_unpin(rdev);
2457} 2457}
2458 2458
2459void si_pcie_gart_fini(struct radeon_device *rdev) 2459static void si_pcie_gart_fini(struct radeon_device *rdev)
2460{ 2460{
2461 si_pcie_gart_disable(rdev); 2461 si_pcie_gart_disable(rdev);
2462 radeon_gart_table_vram_free(rdev); 2462 radeon_gart_table_vram_free(rdev);