geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use virt_to_page instead of vmalloc_to_page in drm_do_vm_shm_nopage for 

consistent pages allocated with drm_pci_alloc.
main
Felix Kuehling 2005-01-12 16:07:49 +00:00
parent ee57636763
commit d4a8f16eb6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
linux-core/drm_vm.c
View File

@ -151,7 +151,8 @@ static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma,
offset = address - vma->vm_start; offset = address - vma->vm_start;
i = (unsigned long)map->handle + offset; i = (unsigned long)map->handle + offset;
page = vmalloc_to_page((void *)i); page = (map->type == _DRM_CONSISTENT) ?
virt_to_page((void *)i) : vmalloc_to_page((void *)i);
if (!page) if (!page)
return NOPAGE_OOM; return NOPAGE_OOM;
get_page(page); get_page(page);
@ -663,8 +664,9 @@ int drm_mmap(struct file *filp, struct vm_area_struct *vma)
break; break;
case _DRM_SHM: case _DRM_SHM:
case _DRM_CONSISTENT: case _DRM_CONSISTENT:
/* Consistent memory is really like shared memory. It's only /* Consistent memory is much like shared memory. The
* allocated in a different way. */ * only difference is that drm_vm_shm_nopage must use
* virt_to_page instead of vmalloc_to_page. */
vma->vm_ops = &drm_vm_shm_ops; vma->vm_ops = &drm_vm_shm_ops;
vma->vm_private_data = (void *)map; vma->vm_private_data = (void *)map;
/* Don't let this area swap. Change when /* Don't let this area swap. Change when