Merge tag 'drm-vmwgfx-coherent-2019-11-29' of git://anongit.freedesktop.org/drm/drm
Pull drm coherent memory support for vmwgfx from Dave Airlie: "This is a separate pull for the mm pagewalking + drm/vmwgfx work Thomas did and you were involved in, I've left it separate in case you don't feel as comfortable with it as the other stuff. It has mm acks/r-b in the right places from what I can see" * tag 'drm-vmwgfx-coherent-2019-11-29' of git://anongit.freedesktop.org/drm/drm: drm/vmwgfx: Add surface dirty-tracking callbacks drm/vmwgfx: Implement an infrastructure for read-coherent resources drm/vmwgfx: Use an RBtree instead of linked list for MOB resources drm/vmwgfx: Implement an infrastructure for write-coherent resources mm: Add write-protect and clean utilities for address space ranges mm: Add a walk_page_mapping() function to the pagewalk code mm: pagewalk: Take the pagetable lock in walk_pte_range() mm: Remove BUG_ON mmap_sem not held from xxx_trans_huge_lock() drm/ttm: Convert vm callbacks to helpers drm/ttm: Remove explicit typecasts of vm_private_data
Showing
- drivers/gpu/drm/ttm/ttm_bo_vm.c 107 additions, 67 deletionsdrivers/gpu/drm/ttm/ttm_bo_vm.c
- drivers/gpu/drm/vmwgfx/Kconfig 1 addition, 0 deletionsdrivers/gpu/drm/vmwgfx/Kconfig
- drivers/gpu/drm/vmwgfx/Makefile 1 addition, 1 deletiondrivers/gpu/drm/vmwgfx/Makefile
- drivers/gpu/drm/vmwgfx/device_include/svga3d_surfacedefs.h 232 additions, 1 deletiondrivers/gpu/drm/vmwgfx/device_include/svga3d_surfacedefs.h
- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c 7 additions, 3 deletionsdrivers/gpu/drm/vmwgfx/vmwgfx_bo.c
- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 33 additions, 11 deletionsdrivers/gpu/drm/vmwgfx/vmwgfx_drv.h
- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 0 additions, 1 deletiondrivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
- drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c 488 additions, 0 deletionsdrivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c
- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c 180 additions, 13 deletionsdrivers/gpu/drm/vmwgfx/vmwgfx_resource.c
- drivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h 13 additions, 0 deletionsdrivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h
- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c 392 additions, 3 deletionsdrivers/gpu/drm/vmwgfx/vmwgfx_surface.c
- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c 14 additions, 1 deletiondrivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
- drivers/gpu/drm/vmwgfx/vmwgfx_validation.c 73 additions, 1 deletiondrivers/gpu/drm/vmwgfx/vmwgfx_validation.c
- drivers/gpu/drm/vmwgfx/vmwgfx_validation.h 2 additions, 14 deletionsdrivers/gpu/drm/vmwgfx/vmwgfx_validation.h
- include/drm/ttm/ttm_bo_api.h 14 additions, 0 deletionsinclude/drm/ttm/ttm_bo_api.h
- include/linux/huge_mm.h 0 additions, 2 deletionsinclude/linux/huge_mm.h
- include/linux/mm.h 12 additions, 1 deletioninclude/linux/mm.h
- include/linux/pagewalk.h 9 additions, 0 deletionsinclude/linux/pagewalk.h
- include/uapi/drm/vmwgfx_drm.h 3 additions, 1 deletioninclude/uapi/drm/vmwgfx_drm.h
- mm/Kconfig 3 additions, 0 deletionsmm/Kconfig
Loading
Please register or sign in to comment