drm/radeon/kms: stop putting VRAM at 0 in MC space on r600s. (4d357abb) · Commits · 戴 / test

The Lenovo W500 laptop hangs inside an SMI on brightness changes, I thought it just needed the VGA disable but it turned out to require slightly more work, setting the MC locations up just like the IGP chip requirements seems to make it all happy again and I can boot and play with brightness. We should probably just do this for all chips and give up the VRAM at 0x0 idea, it never seems to buy us anything but pain. Signed-off-by:

Dave Airlie <airlied@redhat.com>

drivers/gpu/drm/radeon/r600.c

+19 −25

Original line number	Diff line number	Diff line
		@@ -409,10 +409,9 @@ int r600_mc_init(struct radeon_device *rdev)
		rdev->mc.gtt_location = rdev->mc.mc_vram_size;
		}
		} else {
		if (rdev->family == CHIP_RS780 \|\| rdev->family == CHIP_RS880) {
		rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;
		rdev->mc.vram_location = (RREG32(MC_VM_FB_LOCATION) &
		0xFFFF) << 24;
		rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;
		tmp = rdev->mc.vram_location + rdev->mc.mc_vram_size;
		if ((0xFFFFFFFFUL - tmp) >= rdev->mc.gtt_size) {
		/* Enough place after vram */
		@@ -433,11 +432,6 @@ int r600_mc_init(struct radeon_device *rdev)
		}
		}
		rdev->mc.gtt_location = rdev->mc.mc_vram_size;
		} else {
		rdev->mc.vram_location = 0x00000000UL;
		rdev->mc.gtt_location = rdev->mc.mc_vram_size;
		rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;
		}
		}
		rdev->mc.vram_start = rdev->mc.vram_location;
		rdev->mc.vram_end = rdev->mc.vram_location + rdev->mc.mc_vram_size - 1;

Admin message