diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-18 10:32:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-18 10:32:23 -0400 |
| commit | ff69c00f0a58383f1f60dd2756e54a857f08d249 (patch) | |
| tree | c4f0da77fbad8f7a002bd43be9c28a1f1214f1a1 /drivers/char/drm/radeon_cp.c | |
| parent | 9e5858244926f4fddf8ba38a6b4fa3fe68e93836 (diff) | |
| parent | b05c23851ab820b1957cd2f322eaa1ac44c196bd (diff) | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/ati_pcigart: fix the PCIGART to use drm_pci to allocate GART table.
drm/radeon: fixup RV550 chip family
drm/via: attempt again to stabilise the AGP DMA command submission.
drm: Fix race that can lockup the kernel
Diffstat (limited to 'drivers/char/drm/radeon_cp.c')
| -rw-r--r-- | drivers/char/drm/radeon_cp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c index 833abc7e55fb..9072e4a1894e 100644 --- a/drivers/char/drm/radeon_cp.c +++ b/drivers/char/drm/radeon_cp.c | |||
| @@ -1807,6 +1807,7 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init) | |||
| 1807 | } else | 1807 | } else |
| 1808 | #endif | 1808 | #endif |
| 1809 | { | 1809 | { |
| 1810 | dev_priv->gart_info.table_mask = DMA_BIT_MASK(32); | ||
| 1810 | /* if we have an offset set from userspace */ | 1811 | /* if we have an offset set from userspace */ |
| 1811 | if (dev_priv->pcigart_offset_set) { | 1812 | if (dev_priv->pcigart_offset_set) { |
| 1812 | dev_priv->gart_info.bus_addr = | 1813 | dev_priv->gart_info.bus_addr = |