Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 392c14be authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert radeon AGP aperture offset changes 



This reverts the series of commits

	67dbb4ea
	281ab031
	47807ce3

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: default avatarLinus Torvalds <torvalds@osdl.org>
parent bc781aa9

drivers/char/drm/radeon_cp.c

+2 −9
Original line number Diff line number Diff line
@@ -1312,8 +1312,6 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on) 
static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)

{

	drm_radeon_private_t *dev_priv = dev->dev_private;

	unsigned int mem_size, aper_size;



	DRM_DEBUG("\n");



	dev_priv->is_pci = init->is_pci;
@@ -1523,13 +1521,8 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init) 
					  + dev_priv->fb_location) >> 10));



	dev_priv->gart_size = init->gart_size;



	mem_size = RADEON_READ(RADEON_CONFIG_MEMSIZE);

	if (mem_size == 0)

		mem_size = 0x800000;

	aper_size = max(RADEON_READ(RADEON_CONFIG_APER_SIZE), mem_size);



	dev_priv->gart_vm_start = dev_priv->fb_location + aper_size;

	dev_priv->gart_vm_start = dev_priv->fb_location

	    + RADEON_READ(RADEON_CONFIG_APER_SIZE);



#if __OS_HAS_AGP

	if (!dev_priv->is_pci)