forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge tag 'v2.6.35-rc6' into drm-radeon-next

Browse source 
Need this to avoid conflicts with future radeon fixes
This commit is contained in:
Dave Airlie 2010-08-02 10:05:18 +10:00
commit d656ae53f6
597 changed files with 6200 additions and 198259 deletions
Download patch file Download diff file Expand all files Collapse all files

1
drivers/gpu/drm/radeon/r600.c
View file

@ -1194,6 +1194,7 @@ void r600_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc)
if (rdev->flags & RADEON_IS_IGP)
base = (RREG32(MC_VM_FB_LOCATION) & 0xFFFF) << 24;
radeon_vram_location(rdev, &rdev->mc, base);
rdev->mc.gtt_base_align = 0;
radeon_gtt_location(rdev, mc);
}
}