diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:43:33 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:43:33 -0500 |
| commit | d00d598ffbba974d9045ba8b95296655fe2162c5 (patch) | |
| tree | 93bdc3bf4ec728d554c54e3f1f51cb5597f53a31 /drivers/char | |
| parent | b5632303401c231bf270ef36f1013e52caf4caf9 (diff) | |
| parent | be0d9b6c7aeaad1683059c00131cabd4c894c17c (diff) | |
| download | talos-obmc-linux-d00d598ffbba974d9045ba8b95296655fe2162c5.tar.gz talos-obmc-linux-d00d598ffbba974d9045ba8b95296655fe2162c5.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/drm/radeon_cp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c index 03839ea31092..9f2b4efd0c7a 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_t * dev, drm_radeon_init_t * init) dev_priv->gart_size = init->gart_size; dev_priv->gart_vm_start = dev_priv->fb_location - + RADEON_READ(RADEON_CONFIG_APER_SIZE); + + RADEON_READ(RADEON_CONFIG_APER_SIZE) * 2; #if __OS_HAS_AGP if (!dev_priv->is_pci) |
