drm: Fix mismerge of non-coherent DMA patch
PATCH 1/2 drm: Fix mismerge of non-coherent DMA patch
The patch for supporting non coherent PCI DMA in the DRM was mismerged causing the page protection to be updated for the wrong type of mapping.
Signed-off-by Benjamin Herrenschmidt <[email protected]>
---
David, if ok, please fwd to stable too.
drivers/char/drm/drm_vm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/drm/drm_vm.c +1 -1
@@ -640,12 +640,12 @@ static int drm_mmap_locked(struct file */* Don't let this area swap. Change when DRM_KERNEL advisory is supported. */ vma->vm_flags |=VM_RESERVED ; - vma->vm_page_prot =drm_dma_prot (map->type, vma);break ;case _DRM_SCATTER_GATHER: vma->vm_ops = &drm_vm_sg_ops; vma->vm_private_data = (void *)map; vma->vm_flags |=VM_RESERVED ; + vma->vm_page_prot =drm_dma_prot (map->type, vma);break ;default :return -EINVAL ;/* This should never happen. */