aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/evergreen.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen.c')
-rw-r--r--drivers/gpu/drm/radeon/evergreen.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index bd2e7aa85c1..647a0efdc35 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -25,6 +25,7 @@
25#include <linux/platform_device.h> 25#include <linux/platform_device.h>
26#include "drmP.h" 26#include "drmP.h"
27#include "radeon.h" 27#include "radeon.h"
28#include "radeon_asic.h"
28#include "radeon_drm.h" 29#include "radeon_drm.h"
29#include "rv770d.h" 30#include "rv770d.h"
30#include "atom.h" 31#include "atom.h"
@@ -436,7 +437,6 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
436 437
437int evergreen_mc_init(struct radeon_device *rdev) 438int evergreen_mc_init(struct radeon_device *rdev)
438{ 439{
439 fixed20_12 a;
440 u32 tmp; 440 u32 tmp;
441 int chansize, numchan; 441 int chansize, numchan;
442 442
@@ -481,12 +481,8 @@ int evergreen_mc_init(struct radeon_device *rdev)
481 rdev->mc.real_vram_size = rdev->mc.aper_size; 481 rdev->mc.real_vram_size = rdev->mc.aper_size;
482 } 482 }
483 r600_vram_gtt_location(rdev, &rdev->mc); 483 r600_vram_gtt_location(rdev, &rdev->mc);
484 /* FIXME: we should enforce default clock in case GPU is not in 484 radeon_update_bandwidth_info(rdev);
485 * default setup 485
486 */
487 a.full = rfixed_const(100);
488 rdev->pm.sclk.full = rfixed_const(rdev->clock.default_sclk);
489 rdev->pm.sclk.full = rfixed_div(rdev->pm.sclk, a);
490 return 0; 486 return 0;
491} 487}
492 488
@@ -746,6 +742,7 @@ int evergreen_init(struct radeon_device *rdev)
746 742
747void evergreen_fini(struct radeon_device *rdev) 743void evergreen_fini(struct radeon_device *rdev)
748{ 744{
745 radeon_pm_fini(rdev);
749 evergreen_suspend(rdev); 746 evergreen_suspend(rdev);
750#if 0 747#if 0
751 r600_blit_fini(rdev); 748 r600_blit_fini(rdev);