mirror of
https://github.com/torvalds/linux
synced 2024-09-24 05:17:36 +00:00
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>
This commit is contained in:
parent
bc212b9cf8
commit
e1e78533f2
|
@ -80,7 +80,7 @@ drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t ali
|
||||||
/* Reserve */
|
/* Reserve */
|
||||||
for (addr = (unsigned long)dmah->vaddr, sz = size;
|
for (addr = (unsigned long)dmah->vaddr, sz = size;
|
||||||
sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) {
|
sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) {
|
||||||
SetPageReserved(virt_to_page(addr));
|
SetPageReserved(virt_to_page((void *)addr));
|
||||||
}
|
}
|
||||||
|
|
||||||
return dmah;
|
return dmah;
|
||||||
|
@ -103,7 +103,7 @@ void __drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
|
||||||
/* Unreserve */
|
/* Unreserve */
|
||||||
for (addr = (unsigned long)dmah->vaddr, sz = dmah->size;
|
for (addr = (unsigned long)dmah->vaddr, sz = dmah->size;
|
||||||
sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) {
|
sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) {
|
||||||
ClearPageReserved(virt_to_page(addr));
|
ClearPageReserved(virt_to_page((void *)addr));
|
||||||
}
|
}
|
||||||
dma_free_coherent(&dev->pdev->dev, dmah->size, dmah->vaddr,
|
dma_free_coherent(&dev->pdev->dev, dmah->size, dmah->vaddr,
|
||||||
dmah->busaddr);
|
dmah->busaddr);
|
||||||
|
|
|
@ -301,7 +301,7 @@ static int drm_do_vm_dma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
|
||||||
|
|
||||||
offset = (unsigned long)vmf->virtual_address - vma->vm_start; /* vm_[pg]off[set] should be 0 */
|
offset = (unsigned long)vmf->virtual_address - vma->vm_start; /* vm_[pg]off[set] should be 0 */
|
||||||
page_nr = offset >> PAGE_SHIFT; /* page_nr could just be vmf->pgoff */
|
page_nr = offset >> PAGE_SHIFT; /* page_nr could just be vmf->pgoff */
|
||||||
page = virt_to_page(dma->pagelist[page_nr]);
|
page = virt_to_page((void *)dma->pagelist[page_nr]);
|
||||||
|
|
||||||
get_page(page);
|
get_page(page);
|
||||||
vmf->page = page;
|
vmf->page = page;
|
||||||
|
|
Loading…
Reference in a new issue