diff options
| author | Dave Airlie <airlied@starflyer-ubuntu.(none)> | 2006-08-29 00:01:19 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@starflyer-ubuntu.(none)> | 2006-08-29 00:01:19 +1000 |
| commit | 3cfab681b3c82c7951f1cc337d2021a6f0d08b1e (patch) | |
| tree | 4d880f5961a0fe31bddf80391923f117add9e674 /linux-core/via_dmablit.c | |
| parent | 88928380c87e60d22a0a9698c468036f180f0761 (diff) | |
| parent | 9b984b34e99f694e10251e15bc2ec1bc844dcca4 (diff) | |
Merge branch 'master' into nouveau-1
Diffstat (limited to 'linux-core/via_dmablit.c')
| -rw-r--r-- | linux-core/via_dmablit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/via_dmablit.c b/linux-core/via_dmablit.c index 61e6a102..fdc2bd67 100644 --- a/linux-core/via_dmablit.c +++ b/linux-core/via_dmablit.c @@ -125,10 +125,10 @@ via_map_blit_for_device(struct pci_dev *pdev, line_len -= remaining_len; if (mode == 1) { - desc_ptr->mem_addr = dma_map_page(&pdev->dev, - vsg->pages[VIA_PFN(cur_mem) - + desc_ptr->mem_addr = dma_map_page(&pdev->dev, + vsg->pages[VIA_PFN(cur_mem) - VIA_PFN(first_addr)], - VIA_PGOFF(cur_mem), remaining_len, + VIA_PGOFF(cur_mem), remaining_len, vsg->direction); desc_ptr->dev_addr = cur_fb; |