aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLauri Kasanen <cand@gmx.com>2012-07-31 10:41:46 -0400
committerAlex Deucher <alexander.deucher@amd.com>2012-09-20 13:10:41 -0400
commite9e2fbe975a1938b1acadb94ac7d5934298974ac (patch)
tree3dcab3d14e203deb405bfe7be0399719fbc60b6e /drivers
parent1109ca09b9e2f2766d64d037a88ea8816559b3b3 (diff)
drm/radeon: Remove unused functions
This applies on top of drm/radeon: Mark all possible functions / structs as static. Signed-off-by: Lauri Kasanen <cand@gmx.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/radeon/r100.c44
-rw-r--r--drivers/gpu/drm/radeon/radeon_combios.c9
-rw-r--r--drivers/gpu/drm/radeon/radeon_fb.c16
-rw-r--r--drivers/gpu/drm/radeon/radeon_legacy_crtc.c5
4 files changed, 0 insertions, 74 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index cd11760f239..f3892efcf7f 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -2528,50 +2528,6 @@ static void r100_errata(struct radeon_device *rdev)
2528 } 2528 }
2529} 2529}
2530 2530
2531/* Wait for vertical sync on primary CRTC */
2532static void r100_gpu_wait_for_vsync(struct radeon_device *rdev)
2533{
2534 uint32_t crtc_gen_cntl, tmp;
2535 int i;
2536
2537 crtc_gen_cntl = RREG32(RADEON_CRTC_GEN_CNTL);
2538 if ((crtc_gen_cntl & RADEON_CRTC_DISP_REQ_EN_B) ||
2539 !(crtc_gen_cntl & RADEON_CRTC_EN)) {
2540 return;
2541 }
2542 /* Clear the CRTC_VBLANK_SAVE bit */
2543 WREG32(RADEON_CRTC_STATUS, RADEON_CRTC_VBLANK_SAVE_CLEAR);
2544 for (i = 0; i < rdev->usec_timeout; i++) {
2545 tmp = RREG32(RADEON_CRTC_STATUS);
2546 if (tmp & RADEON_CRTC_VBLANK_SAVE) {
2547 return;
2548 }
2549 DRM_UDELAY(1);
2550 }
2551}
2552
2553/* Wait for vertical sync on secondary CRTC */
2554static void r100_gpu_wait_for_vsync2(struct radeon_device *rdev)
2555{
2556 uint32_t crtc2_gen_cntl, tmp;
2557 int i;
2558
2559 crtc2_gen_cntl = RREG32(RADEON_CRTC2_GEN_CNTL);
2560 if ((crtc2_gen_cntl & RADEON_CRTC2_DISP_REQ_EN_B) ||
2561 !(crtc2_gen_cntl & RADEON_CRTC2_EN))
2562 return;
2563
2564 /* Clear the CRTC_VBLANK_SAVE bit */
2565 WREG32(RADEON_CRTC2_STATUS, RADEON_CRTC2_VBLANK_SAVE_CLEAR);
2566 for (i = 0; i < rdev->usec_timeout; i++) {
2567 tmp = RREG32(RADEON_CRTC2_STATUS);
2568 if (tmp & RADEON_CRTC2_VBLANK_SAVE) {
2569 return;
2570 }
2571 DRM_UDELAY(1);
2572 }
2573}
2574
2575static int r100_rbbm_fifo_wait_for_entry(struct radeon_device *rdev, unsigned n) 2531static int r100_rbbm_fifo_wait_for_entry(struct radeon_device *rdev, unsigned n)
2576{ 2532{
2577 unsigned i; 2533 unsigned i;
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index 854d1e23036..8a73f075890 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -3319,15 +3319,6 @@ 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
3322static void radeon_combios_dyn_clk_setup(struct drm_device *dev, int enable)
3323{
3324 uint16_t dyn_clk_info =
3325 combios_get_table_offset(dev, COMBIOS_DYN_CLK_1_TABLE);
3326
3327 if (dyn_clk_info)
3328 combios_parse_pll_table(dev, dyn_clk_info);
3329}
3330
3331void radeon_combios_asic_init(struct drm_device *dev) 3322void radeon_combios_asic_init(struct drm_device *dev)
3332{ 3323{
3333 struct radeon_device *rdev = dev->dev_private; 3324 struct radeon_device *rdev = dev->dev_private;
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index 8b088ca1209..6ada72c6d7a 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -316,22 +316,6 @@ static int radeon_fb_find_or_create_single(struct drm_fb_helper *helper,
316 return new_fb; 316 return new_fb;
317} 317}
318 318
319static char *mode_option;
320static int radeon_parse_options(char *options)
321{
322 char *this_opt;
323
324 if (!options || !*options)
325 return 0;
326
327 while ((this_opt = strsep(&options, ",")) != NULL) {
328 if (!*this_opt)
329 continue;
330 mode_option = this_opt;
331 }
332 return 0;
333}
334
335void radeon_fb_output_poll_changed(struct radeon_device *rdev) 319void radeon_fb_output_poll_changed(struct radeon_device *rdev)
336{ 320{
337 drm_fb_helper_hotplug_event(&rdev->mode_info.rfbdev->helper); 321 drm_fb_helper_hotplug_event(&rdev->mode_info.rfbdev->helper);
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
index e946bfcf25b..5677a424b58 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
@@ -206,11 +206,6 @@ 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
209static void radeon_restore_common_regs(struct drm_device *dev)
210{
211 /* don't need this yet */
212}
213
214static void radeon_pll_wait_for_read_update_complete(struct drm_device *dev) 209static void radeon_pll_wait_for_read_update_complete(struct drm_device *dev)
215{ 210{
216 struct radeon_device *rdev = dev->dev_private; 211 struct radeon_device *rdev = dev->dev_private;