Merge tag 'v2.6.35-rc6' into drm-radeon-next
Need this to avoid conflicts with future radeon fixes
This commit is contained in:
commit
d656ae53f6
597 changed files with 6200 additions and 198259 deletions
|
|
@ -195,6 +195,7 @@ void rv515_mc_init(struct radeon_device *rdev)
|
|||
rv515_vram_get_type(rdev);
|
||||
r100_vram_init_sizes(rdev);
|
||||
radeon_vram_location(rdev, &rdev->mc, 0);
|
||||
rdev->mc.gtt_base_align = 0;
|
||||
if (!(rdev->flags & RADEON_IS_AGP))
|
||||
radeon_gtt_location(rdev, &rdev->mc);
|
||||
radeon_update_bandwidth_info(rdev);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue