diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2013-10-27 17:52:39 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-11-05 22:23:20 -0500 |
commit | e1e78533f2ddeabef5dc6545739211795ac4b822 (patch) | |
tree | 42059a1288bbdc043da8674e285d25bcb1f3873c /drivers | |
parent | bc212b9cf808add5b1e7a6913b10b1802c270c3c (diff) |
drm: Pass pointers to virt_to_page()
Most architectures define virt_to_page() as a macro that casts its
argument such that an argument of type unsigned long will be accepted
without complaint. However, the proper type is void *, and passing
unsigned long results in a warning on MIPS.
Compile-tested only.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/drm_pci.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_vm.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index f00d7a9671ea..02679793c9e2 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c | |||
@@ -80,7 +80,7 @@ drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t ali | |||
80 | /* Reserve */ | 80 | /* Reserve */ |
81 | for (addr = (unsigned long)dmah->vaddr, sz = size; | 81 | for (addr = (unsigned long)dmah->vaddr, sz = size; |
82 | sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) { | 82 | sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) { |
83 | SetPageReserved(virt_to_page(addr)); | 83 | SetPageReserved(virt_to_page((void *)addr)); |
84 | } | 84 | } |
85 | 85 | ||
86 | return dmah; | 86 | return dmah; |
@@ -103,7 +103,7 @@ void __drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah) | |||
103 | /* Unreserve */ | 103 | /* Unreserve */ |
104 | for (addr = (unsigned long)dmah->vaddr, sz = dmah->size; | 104 | for (addr = (unsigned long)dmah->vaddr, sz = dmah->size; |
105 | sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) { | 105 | sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) { |
106 | ClearPageReserved(virt_to_page(addr)); | 106 | ClearPageReserved(virt_to_page((void *)addr)); |
107 | } | 107 | } |
108 | dma_free_coherent(&dev->pdev->dev, dmah->size, dmah->vaddr, | 108 | dma_free_coherent(&dev->pdev->dev, dmah->size, dmah->vaddr, |
109 | dmah->busaddr); | 109 | dmah->busaddr); |
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index 8ef6503488e0..93e95d7efd57 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c | |||
@@ -301,7 +301,7 @@ static int drm_do_vm_dma_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
301 | 301 | ||
302 | offset = (unsigned long)vmf->virtual_address - vma->vm_start; /* vm_[pg]off[set] should be 0 */ | 302 | offset = (unsigned long)vmf->virtual_address - vma->vm_start; /* vm_[pg]off[set] should be 0 */ |
303 | page_nr = offset >> PAGE_SHIFT; /* page_nr could just be vmf->pgoff */ | 303 | page_nr = offset >> PAGE_SHIFT; /* page_nr could just be vmf->pgoff */ |
304 | page = virt_to_page(dma->pagelist[page_nr]); | 304 | page = virt_to_page((void *)dma->pagelist[page_nr]); |
305 | 305 | ||
306 | get_page(page); | 306 | get_page(page); |
307 | vmf->page = page; | 307 | vmf->page = page; |