diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 02:26:27 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 02:26:27 +0400 |
| commit | 63e8d9114dab88c101be2372cb1f83a4fe74d9c1 (patch) | |
| tree | 424e8f1bdc1daf12ad83a64958156245cd9f1de8 /drivers/char/drm/drm_dma.c | |
| parent | d1127e40e8d75cd3855e35424937c73d0bcec558 (diff) | |
| parent | 55eb061326765b2d0489387cfb3fc7dbd244f917 (diff) | |
| download | linux-63e8d9114dab88c101be2372cb1f83a4fe74d9c1.tar.xz | |
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: remove drm_{alloc,free}_pages
drm: sis fix compile warning
drm: add new radeon PCI ids..
drm: read breadcrumb in IRQ handler
drm: fixup i915 breadcrumb read/write
drm: remove pointless checks in radeon_state
drm: fixup improper cast.
drm: rationalise some pci ids
drm: Add general-purpose packet for manipulating scratch registers (r300)
drm: rework radeon memory map (radeon 1.23)
drm: update r300 register names
drm: fixup PCI DMA support
Diffstat (limited to 'drivers/char/drm/drm_dma.c')
| -rw-r--r-- | drivers/char/drm/drm_dma.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/char/drm/drm_dma.c b/drivers/char/drm/drm_dma.c index 2afab95ca036..892db7096986 100644 --- a/drivers/char/drm/drm_dma.c +++ b/drivers/char/drm/drm_dma.c @@ -85,9 +85,7 @@ void drm_dma_takedown(drm_device_t * dev) dma->bufs[i].seg_count); for (j = 0; j < dma->bufs[i].seg_count; j++) { if (dma->bufs[i].seglist[j]) { - drm_free_pages(dma->bufs[i].seglist[j], - dma->bufs[i].page_order, - DRM_MEM_DMA); + drm_pci_free(dev, dma->bufs[i].seglist[j]); } } drm_free(dma->bufs[i].seglist, |