summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Delgass <ldelgass@users.sourceforge.net>2003-04-24 23:18:33 +0000
committerLeif Delgass <ldelgass@users.sourceforge.net>2003-04-24 23:18:33 +0000
commit16fda821eb457818414faa57bf9ccfba93c3a350 (patch)
tree0a655035854515dc00e28b3779e6c14c3b058bdf
parenta147df879b3b850612222759c14f4142d2406e74 (diff)
Pass dma handle from pci_alloc_consistent to the card for status page,
rather than using virt_to_bus() on the virtual address.
-rw-r--r--linux-core/i830_dma.c2
-rw-r--r--linux/i830_dma.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/i830_dma.c b/linux-core/i830_dma.c
index df58e990..6a41d2b5 100644
--- a/linux-core/i830_dma.c
+++ b/linux-core/i830_dma.c
@@ -460,7 +460,7 @@ static int i830_dma_initialize(drm_device_t *dev,
memset((void *) dev_priv->hw_status_page, 0, PAGE_SIZE);
DRM_DEBUG("hw status page @ %lx\n", dev_priv->hw_status_page);
- I830_WRITE(0x02080, virt_to_bus((void *)dev_priv->hw_status_page));
+ I830_WRITE(0x02080, dev_priv->dma_status_page);
DRM_DEBUG("Enabled hardware status page\n");
/* Now we need to init our freelist */
diff --git a/linux/i830_dma.c b/linux/i830_dma.c
index df58e990..6a41d2b5 100644
--- a/linux/i830_dma.c
+++ b/linux/i830_dma.c
@@ -460,7 +460,7 @@ static int i830_dma_initialize(drm_device_t *dev,
memset((void *) dev_priv->hw_status_page, 0, PAGE_SIZE);
DRM_DEBUG("hw status page @ %lx\n", dev_priv->hw_status_page);
- I830_WRITE(0x02080, virt_to_bus((void *)dev_priv->hw_status_page));
+ I830_WRITE(0x02080, dev_priv->dma_status_page);
DRM_DEBUG("Enabled hardware status page\n");
/* Now we need to init our freelist */