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/rv770.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/rv770.c')
-rw-r--r-- | drivers/gpu/drm/radeon/rv770.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 86d39cb35fe2..ef946a3af746 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c | |||
@@ -868,7 +868,6 @@ static void rv770_gpu_init(struct radeon_device *rdev) | |||
868 | 868 | ||
869 | int rv770_mc_init(struct radeon_device *rdev) | 869 | int rv770_mc_init(struct radeon_device *rdev) |
870 | { | 870 | { |
871 | fixed20_12 a; | ||
872 | u32 tmp; | 871 | u32 tmp; |
873 | int chansize, numchan; | 872 | int chansize, numchan; |
874 | 873 | ||
@@ -912,12 +911,8 @@ int rv770_mc_init(struct radeon_device *rdev) | |||
912 | rdev->mc.real_vram_size = rdev->mc.aper_size; | 911 | rdev->mc.real_vram_size = rdev->mc.aper_size; |
913 | } | 912 | } |
914 | r600_vram_gtt_location(rdev, &rdev->mc); | 913 | r600_vram_gtt_location(rdev, &rdev->mc); |
915 | /* FIXME: we should enforce default clock in case GPU is not in | 914 | radeon_update_bandwidth_info(rdev); |
916 | * default setup | 915 | |
917 | */ | ||
918 | a.full = rfixed_const(100); | ||
919 | rdev->pm.sclk.full = rfixed_const(rdev->clock.default_sclk); | ||
920 | rdev->pm.sclk.full = rfixed_div(rdev->pm.sclk, a); | ||
921 | return 0; | 916 | return 0; |
922 | } | 917 | } |
923 | 918 | ||