diff options
author | Dave Airlie <airlied@redhat.com> | 2010-08-02 02:05:18 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-08-02 02:05:24 +0200 |
commit | d656ae53f64cb0f01dac8a02c4d31453d64ef97c (patch) | |
tree | cf641d4e5828b8f7c430b42657237c5daf9571fd /drivers/gpu/drm/radeon/rs690.c | |
parent | drm: radeon: fix sign bug (diff) | |
parent | Linux 2.6.35-rc6 (diff) | |
download | linux-d656ae53f64cb0f01dac8a02c4d31453d64ef97c.tar.xz linux-d656ae53f64cb0f01dac8a02c4d31453d64ef97c.zip |
Merge tag 'v2.6.35-rc6' into drm-radeon-next
Need this to avoid conflicts with future radeon fixes
Diffstat (limited to 'drivers/gpu/drm/radeon/rs690.c')
-rw-r--r-- | drivers/gpu/drm/radeon/rs690.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c index 3dde54d57d09..f3a8c9344c64 100644 --- a/drivers/gpu/drm/radeon/rs690.c +++ b/drivers/gpu/drm/radeon/rs690.c @@ -162,6 +162,7 @@ void rs690_mc_init(struct radeon_device *rdev) rs690_pm_info(rdev); rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev); radeon_vram_location(rdev, &rdev->mc, base); + rdev->mc.gtt_base_align = rdev->mc.gtt_size - 1; radeon_gtt_location(rdev, &rdev->mc); radeon_update_bandwidth_info(rdev); } |