Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ff64611 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Dave Airlie
Browse files

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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent b1721d0d

drivers/char/drm/drm_vm.c

+1 −1
Original line number Diff line number Diff line
@@ -640,12 +640,12 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) 
		/* 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. */