Messages in this thread Patch in this message | | | Date | Thu, 15 Dec 2005 20:03:59 +1100 | From | Paul Mackerras <> | Subject | Re: [BUG] Xserver startup locks system... git bisect results |
| |
Benjamin Herrenschmidt writes:
> On Thu, 2005-12-15 at 16:07 +1100, Benjamin Herrenschmidt wrote: > > Ah, also, something else you can try, is replace > > > > dev_priv->gart_vm_start = dev_priv->fb_location > > + RADEON_READ(RADEON_CONFIG_APER_SIZE); > > Actually, the above should read > > + RADEON_READ(RADEON_CONFIG_APER_SIZE) * 2;
With the patch below, my powerbook will sleep and wake up successfully.
Paul.
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c index 9f2b4ef..465fdc2 100644 --- a/drivers/char/drm/radeon_cp.c +++ b/drivers/char/drm/radeon_cp.c @@ -1522,7 +1522,7 @@ static int radeon_do_init_cp(drm_device_ dev_priv->gart_size = init->gart_size; dev_priv->gart_vm_start = dev_priv->fb_location - + RADEON_READ(RADEON_CONFIG_APER_SIZE) * 2; + + RADEON_READ(RADEON_CONFIG_MEMSIZE); #if __OS_HAS_AGP if (!dev_priv->is_pci) diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h index 7bda7e3..d92ccee 100644 --- a/drivers/char/drm/radeon_drv.h +++ b/drivers/char/drm/radeon_drv.h @@ -379,6 +379,7 @@ extern int r300_do_cp_cmdbuf(drm_device_ # define RADEON_PLL_WR_EN (1 << 7) #define RADEON_CLOCK_CNTL_INDEX 0x0008 #define RADEON_CONFIG_APER_SIZE 0x0108 +#define RADEON_CONFIG_MEMSIZE 0x00f8 #define RADEON_CRTC_OFFSET 0x0224 #define RADEON_CRTC_OFFSET_CNTL 0x0228 # define RADEON_CRTC_TILE_EN (1 << 15) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |