git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/radeon: unconfuse return value of radeon_asic->clear_surface_reg
[safe/jmp/linux-2.6]
/
drivers
/
gpu
/
drm
/
drm_pci.c
diff --git
a/drivers/gpu/drm/drm_pci.c
b/drivers/gpu/drm/drm_pci.c
index
577094f
..
e68ebf9
100644
(file)
--- a/
drivers/gpu/drm/drm_pci.c
+++ b/
drivers/gpu/drm/drm_pci.c
@@
-47,8
+47,7
@@
/**
* \brief Allocate a PCI consistent memory block, for DMA.
*/
/**
* \brief Allocate a PCI consistent memory block, for DMA.
*/
-drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t align,
- dma_addr_t maxaddr)
+drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t align)
{
drm_dma_handle_t *dmah;
#if 1
{
drm_dma_handle_t *dmah;
#if 1
@@
-63,11
+62,6
@@
drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t ali
if (align > size)
return NULL;
if (align > size)
return NULL;
- if (pci_set_dma_mask(dev->pdev, maxaddr) != 0) {
- DRM_ERROR("Setting pci dma mask failed\n");
- return NULL;
- }
-
dmah = kmalloc(sizeof(drm_dma_handle_t), GFP_KERNEL);
if (!dmah)
return NULL;
dmah = kmalloc(sizeof(drm_dma_handle_t), GFP_KERNEL);
if (!dmah)
return NULL;