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

Merge commit '5359533801' into drm-core-next

Browse source 
This commit changed an internal radeon structure, that meant a new driver
in -next had to be fixed up, merge in the commit and fix up the driver.

Also fixes a trivial nouveau merge.

Conflicts:
	drivers/gpu/drm/nouveau/nouveau_mem.c
This commit is contained in:
Dave Airlie 2011-03-16 11:34:41 +10:00
commit 38f1cff086
264 changed files with 1906 additions and 1071 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/radeon/ni.c
View file

@ -1039,7 +1039,7 @@ static void cayman_cp_enable(struct radeon_device *rdev, bool enable)
if (enable)
WREG32(CP_ME_CNTL, 0);
else {
rdev->mc.active_vram_size = rdev->mc.visible_vram_size;
radeon_ttm_set_active_vram_size(rdev, rdev->mc.visible_vram_size);
WREG32(CP_ME_CNTL, (CP_ME_HALT | CP_PFP_HALT));
WREG32(SCRATCH_UMSK, 0);
}