git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_device.c
diff --git
a/drivers/gpu/drm/radeon/radeon_device.c
b/drivers/gpu/drm/radeon/radeon_device.c
index
5b61364
..
e680501
100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_device.c
+++ b/
drivers/gpu/drm/radeon/radeon_device.c
@@
-82,6
+82,8
@@
static const char radeon_family_name[][16] = {
"CYPRESS",
"HEMLOCK",
"PALM",
"CYPRESS",
"HEMLOCK",
"PALM",
+ "SUMO",
+ "SUMO2",
"BARTS",
"TURKS",
"CAICOS",
"BARTS",
"TURKS",
"CAICOS",
@@
-752,6
+754,7
@@
int radeon_device_init(struct radeon_device *rdev,
dma_bits = rdev->need_dma32 ? 32 : 40;
r = pci_set_dma_mask(rdev->pdev, DMA_BIT_MASK(dma_bits));
if (r) {
dma_bits = rdev->need_dma32 ? 32 : 40;
r = pci_set_dma_mask(rdev->pdev, DMA_BIT_MASK(dma_bits));
if (r) {
+ rdev->need_dma32 = true;
printk(KERN_WARNING "radeon: No suitable DMA available.\n");
}
printk(KERN_WARNING "radeon: No suitable DMA available.\n");
}