Commit e1e78533 authored by Ben Hutchings's avatar Ben Hutchings Committed by Dave Airlie
Browse files

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: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent bc212b9c

drivers/gpu/drm/drm_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t ali 
	/* Reserve */

	for (addr = (unsigned long)dmah->vaddr, sz = size;

	     sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) {

		SetPageReserved(virt_to_page(addr));

		SetPageReserved(virt_to_page((void *)addr));

	}



	return dmah;
@@ -103,7 +103,7 @@ void __drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah) 
		/* Unreserve */

		for (addr = (unsigned long)dmah->vaddr, sz = dmah->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,

				  dmah->busaddr);

drivers/gpu/drm/drm_vm.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

	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);

	vmf->page = page;

CRA Git | Maintained and supported by SUSTech CRA and CCSE