Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge latest drm-next to pull in the s/fence/dma_fence/ rework,
needed before we merge more i915 fencing patches.
Signed-off-by: 
Daniel Vetter <daniel.vetter@intel.com>
Showing
- Documentation/devicetree/bindings/video/bridge/sil-sii8620.txt 33 additions, 0 deletions...entation/devicetree/bindings/video/bridge/sil-sii8620.txt
- Documentation/sync_file.txt 7 additions, 7 deletionsDocumentation/sync_file.txt
- drivers/base/Kconfig 3 additions, 3 deletionsdrivers/base/Kconfig
- drivers/dma-buf/Kconfig 1 addition, 1 deletiondrivers/dma-buf/Kconfig
- drivers/dma-buf/Makefile 1 addition, 1 deletiondrivers/dma-buf/Makefile
- drivers/dma-buf/dma-buf.c 14 additions, 14 deletionsdrivers/dma-buf/dma-buf.c
- drivers/dma-buf/dma-fence-array.c 46 additions, 45 deletionsdrivers/dma-buf/dma-fence-array.c
- drivers/dma-buf/dma-fence.c 103 additions, 98 deletionsdrivers/dma-buf/dma-fence.c
- drivers/dma-buf/reservation.c 48 additions, 46 deletionsdrivers/dma-buf/reservation.c
- drivers/dma-buf/seqno-fence.c 9 additions, 9 deletionsdrivers/dma-buf/seqno-fence.c
- drivers/dma-buf/sw_sync.c 24 additions, 24 deletionsdrivers/dma-buf/sw_sync.c
- drivers/dma-buf/sync_debug.c 7 additions, 6 deletionsdrivers/dma-buf/sync_debug.c
- drivers/dma-buf/sync_debug.h 4 additions, 5 deletionsdrivers/dma-buf/sync_debug.h
- drivers/dma-buf/sync_file.c 33 additions, 30 deletionsdrivers/dma-buf/sync_file.c
- drivers/gpu/drm/amd/amdgpu/Makefile 1 addition, 1 deletiondrivers/gpu/drm/amd/amdgpu/Makefile
- drivers/gpu/drm/amd/amdgpu/ObjectID.h 0 additions, 7 deletionsdrivers/gpu/drm/amd/amdgpu/ObjectID.h
- drivers/gpu/drm/amd/amdgpu/amdgpu.h 64 additions, 820 deletionsdrivers/gpu/drm/amd/amdgpu/amdgpu.h
- drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c 13 additions, 4 deletionsdrivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
- drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h 1 addition, 1 deletiondrivers/gpu/drm/amd/amdgpu/amdgpu_acp.h
- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c 13 additions, 82 deletionsdrivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
Loading
Please register or sign in to comment