summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-04-20 10:26:25 +1000
committerDave Airlie <airlied@linux.ie>2008-04-26 17:48:17 +1000
commit5ff64611333fd282793ff8997e02138aa2f6aab9 (patch)
tree2e12a44f3e55c28091dda4919d41a9d64078c077 /drivers/char
parentb1721d0da266b4af8cb4419473b4ca36206ab200 (diff)
downloadop-kernel-dev-5ff64611333fd282793ff8997e02138aa2f6aab9.zip
op-kernel-dev-5ff64611333fd282793ff8997e02138aa2f6aab9.tar.gz
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 <benh@kernel.crashing.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/drm/drm_vm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
index 945df72..b20c1e9 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -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. */
OpenPOWER on IntegriCloud