Merge branch 'prime-merge' of ssh://people.freedesktop.org/~airlied/linux into drm-core-next
* 'prime-merge' of ssh://people.freedesktop.org/~airlied/linux: drm/radeon: add PRIME support (v2) i915: add dmabuf/prime buffer sharing support. nouveau: add PRIME support ttm: add prime sharing support to TTM (v2) udl: add prime fd->handle support. drm/prime: add exported buffers to current fprivs imported buffer list (v2) drm/prime: introduce sg->pages/addr arrays helper
No related branches found
No related tags found
Showing
- drivers/gpu/drm/drm_gem.c 15 additions, 6 deletionsdrivers/gpu/drm/drm_gem.c
- drivers/gpu/drm/drm_prime.c 48 additions, 0 deletionsdrivers/gpu/drm/drm_prime.c
- drivers/gpu/drm/i915/Makefile 2 additions, 1 deletiondrivers/gpu/drm/i915/Makefile
- drivers/gpu/drm/i915/i915_drv.c 7 additions, 1 deletiondrivers/gpu/drm/i915/i915_drv.c
- drivers/gpu/drm/i915/i915_drv.h 11 additions, 0 deletionsdrivers/gpu/drm/i915/i915_drv.h
- drivers/gpu/drm/i915/i915_gem.c 35 additions, 2 deletionsdrivers/gpu/drm/i915/i915_gem.c
- drivers/gpu/drm/i915/i915_gem_dmabuf.c 171 additions, 0 deletionsdrivers/gpu/drm/i915/i915_gem_dmabuf.c
- drivers/gpu/drm/i915/i915_gem_gtt.c 13 additions, 2 deletionsdrivers/gpu/drm/i915/i915_gem_gtt.c
- drivers/gpu/drm/nouveau/Makefile 1 addition, 1 deletiondrivers/gpu/drm/nouveau/Makefile
- drivers/gpu/drm/nouveau/nouveau_bo.c 34 additions, 8 deletionsdrivers/gpu/drm/nouveau/nouveau_bo.c
- drivers/gpu/drm/nouveau/nouveau_channel.c 1 addition, 1 deletiondrivers/gpu/drm/nouveau/nouveau_channel.c
- drivers/gpu/drm/nouveau/nouveau_drv.c 7 additions, 1 deletiondrivers/gpu/drm/nouveau/nouveau_drv.c
- drivers/gpu/drm/nouveau/nouveau_drv.h 9 additions, 1 deletiondrivers/gpu/drm/nouveau/nouveau_drv.h
- drivers/gpu/drm/nouveau/nouveau_fence.c 1 addition, 1 deletiondrivers/gpu/drm/nouveau/nouveau_fence.c
- drivers/gpu/drm/nouveau/nouveau_gem.c 5 additions, 1 deletiondrivers/gpu/drm/nouveau/nouveau_gem.c
- drivers/gpu/drm/nouveau/nouveau_mem.c 1 addition, 1 deletiondrivers/gpu/drm/nouveau/nouveau_mem.c
- drivers/gpu/drm/nouveau/nouveau_prime.c 163 additions, 0 deletionsdrivers/gpu/drm/nouveau/nouveau_prime.c
- drivers/gpu/drm/nouveau/nouveau_sgdma.c 4 additions, 1 deletiondrivers/gpu/drm/nouveau/nouveau_sgdma.c
- drivers/gpu/drm/nouveau/nouveau_vm.c 57 additions, 0 deletionsdrivers/gpu/drm/nouveau/nouveau_vm.c
- drivers/gpu/drm/nouveau/nouveau_vm.h 5 additions, 1 deletiondrivers/gpu/drm/nouveau/nouveau_vm.h
Loading
Please register or sign in to comment