diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2010-03-16 20:54:38 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-03-30 23:02:06 -0400 |
commit | f47299c55a837af1727bc601e1fc0fa33adaeda5 (patch) | |
tree | 3cb63394f5fc9d2adb24922f048e17d688c3c371 /drivers/gpu/drm/radeon/evergreen.c | |
parent | 9e7b414edbf5e037c1462bbd8676465ed2ae0ac3 (diff) |
drm/radeon/kms: display watermark fixes
- rs780/880 were using the wrong bandwidth functions
- convert r1xx-r4xx to use the same pm sclk/mclk structs as
r5xx+
- move bandwidth setup to a common function
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen.c')
-rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index db78d93f7f20..647a0efdc353 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
@@ -437,7 +437,6 @@ static void evergreen_gpu_init(struct radeon_device *rdev) | |||
437 | 437 | ||
438 | int evergreen_mc_init(struct radeon_device *rdev) | 438 | int evergreen_mc_init(struct radeon_device *rdev) |
439 | { | 439 | { |
440 | fixed20_12 a; | ||
441 | u32 tmp; | 440 | u32 tmp; |
442 | int chansize, numchan; | 441 | int chansize, numchan; |
443 | 442 | ||
@@ -482,12 +481,8 @@ int evergreen_mc_init(struct radeon_device *rdev) | |||
482 | rdev->mc.real_vram_size = rdev->mc.aper_size; | 481 | rdev->mc.real_vram_size = rdev->mc.aper_size; |
483 | } | 482 | } |
484 | r600_vram_gtt_location(rdev, &rdev->mc); | 483 | r600_vram_gtt_location(rdev, &rdev->mc); |
485 | /* FIXME: we should enforce default clock in case GPU is not in | 484 | radeon_update_bandwidth_info(rdev); |
486 | * default setup | 485 | |
487 | */ | ||
488 | a.full = rfixed_const(100); | ||
489 | rdev->pm.sclk.full = rfixed_const(rdev->clock.default_sclk); | ||
490 | rdev->pm.sclk.full = rfixed_div(rdev->pm.sclk, a); | ||
491 | return 0; | 486 | return 0; |
492 | } | 487 | } |
493 | 488 | ||