tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Revert radeon AGP aperture offset changes

This reverts the series of commits

67dbb4ea33731415fe09c62149a34f472719ac1d
281ab031a8c9e5b593142eb4ec59a87faae8676a
47807ce381acc34a7ffee2b42e35e96c0f322e52

that changed the GART VM start offset. It fixed some machines, but
seems to continually interact badly with some X versions.

Quoth Ben Herrenschmidt:

"So I think at this point, the best is that we keep the old bogus code
that at least is consistent with the bug in the server. I'm working on a
big patch to X that reworks the memory map stuff completely and fixes
those issues on the server side, I'll do a DRM patch matching this X fix
as well so that the memory map is only ever set in one place and with
what I hope is a correct algorithm..."

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Linus Torvalds 392c14be bc781aa9

+2 -9
+2 -9
drivers/char/drm/radeon_cp.c
··· 1312 1312 static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init) 1313 1313 { 1314 1314 drm_radeon_private_t *dev_priv = dev->dev_private; 1315 - unsigned int mem_size, aper_size; 1316 - 1317 1315 DRM_DEBUG("\n"); 1318 1316 1319 1317 dev_priv->is_pci = init->is_pci; ··· 1521 1523 + dev_priv->fb_location) >> 10)); 1522 1524 1523 1525 dev_priv->gart_size = init->gart_size; 1524 - 1525 - mem_size = RADEON_READ(RADEON_CONFIG_MEMSIZE); 1526 - if (mem_size == 0) 1527 - mem_size = 0x800000; 1528 - aper_size = max(RADEON_READ(RADEON_CONFIG_APER_SIZE), mem_size); 1529 - 1530 - dev_priv->gart_vm_start = dev_priv->fb_location + aper_size; 1526 + dev_priv->gart_vm_start = dev_priv->fb_location 1527 + + RADEON_READ(RADEON_CONFIG_APER_SIZE); 1531 1528 1532 1529 #if __OS_HAS_AGP 1533 1530 if (!dev_priv->is_pci)