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/r520.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/r520.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r520.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c index f6d8541ebb99..3c44b8d39318 100644 --- a/drivers/gpu/drm/radeon/r520.c +++ b/drivers/gpu/drm/radeon/r520.c | |||
@@ -122,19 +122,13 @@ static void r520_vram_get_type(struct radeon_device *rdev) | |||
122 | 122 | ||
123 | void r520_mc_init(struct radeon_device *rdev) | 123 | void r520_mc_init(struct radeon_device *rdev) |
124 | { | 124 | { |
125 | fixed20_12 a; | ||
126 | 125 | ||
127 | r520_vram_get_type(rdev); | 126 | r520_vram_get_type(rdev); |
128 | r100_vram_init_sizes(rdev); | 127 | r100_vram_init_sizes(rdev); |
129 | radeon_vram_location(rdev, &rdev->mc, 0); | 128 | radeon_vram_location(rdev, &rdev->mc, 0); |
130 | if (!(rdev->flags & RADEON_IS_AGP)) | 129 | if (!(rdev->flags & RADEON_IS_AGP)) |
131 | radeon_gtt_location(rdev, &rdev->mc); | 130 | radeon_gtt_location(rdev, &rdev->mc); |
132 | /* FIXME: we should enforce default clock in case GPU is not in | 131 | radeon_update_bandwidth_info(rdev); |
133 | * default setup | ||
134 | */ | ||
135 | a.full = rfixed_const(100); | ||
136 | rdev->pm.sclk.full = rfixed_const(rdev->clock.default_sclk); | ||
137 | rdev->pm.sclk.full = rfixed_div(rdev->pm.sclk, a); | ||
138 | } | 132 | } |
139 | 133 | ||
140 | void r520_mc_program(struct radeon_device *rdev) | 134 | void r520_mc_program(struct radeon_device *rdev) |