lkml.org 
[lkml]   [2008]   [Apr]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[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 <benh@kernel.crashing.org>
    ---

    David, if ok, please fwd to stable too.

    drivers/char/drm/drm_vm.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- linux-work.orig/drivers/char/drm/drm_vm.c 2008-04-19 16:49:48.000000000 +1000
    +++ linux-work/drivers/char/drm/drm_vm.c 2008-04-19 16:49:55.000000000 +1000
    @@ -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. */

    \
     
     \ /
      Last update: 2008-04-20 02:31    [W:0.028 / U:61.460 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site