Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie: "Just a couple of dma-buf related fixes and some amdgpu fixes, along with a regression fix for radeon off but default feature, but makes my 30" monitor happy again" * 'drm-next' of git://people.freedesktop.org/~airlied/linux: drm/radeon/mst: cleanup code indentation drm/radeon/mst: fix regression in lane/link handling. drm/amdgpu: add invalidate_page callback for userptrs drm/amdgpu: Revert "remove the userptr rmn->lock" drm/amdgpu: clean up path handling for powerplay drm/amd/powerplay: fix memory leak of tdp_table dma-buf/fence: fix fence_is_later v2 dma-buf: Update docs for SYNC ioctl drm: remove excess description dma-buf, drm, ion: Propagate error code from dma_buf_start_cpu_access() drm/atmel-hlcdc: use helper to get crtc state drm/atomic: use helper to get crtc state
Showing
- Documentation/dma-buf-sharing.txt 6 additions, 5 deletionsDocumentation/dma-buf-sharing.txt
- drivers/dma-buf/dma-buf.c 12 additions, 7 deletionsdrivers/dma-buf/dma-buf.c
- drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c 86 additions, 34 deletionsdrivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
- drivers/gpu/drm/amd/powerplay/Makefile 7 additions, 7 deletionsdrivers/gpu/drm/amd/powerplay/Makefile
- drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c 3 additions, 1 deletiondrivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c
- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c 1 addition, 1 deletiondrivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
- drivers/gpu/drm/drm_atomic.c 0 additions, 1 deletiondrivers/gpu/drm/drm_atomic.c
- drivers/gpu/drm/drm_atomic_helper.c 8 additions, 6 deletionsdrivers/gpu/drm/drm_atomic_helper.c
- drivers/gpu/drm/i915/i915_gem_dmabuf.c 5 additions, 10 deletionsdrivers/gpu/drm/i915/i915_gem_dmabuf.c
- drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c 3 additions, 2 deletionsdrivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
- drivers/gpu/drm/radeon/radeon_dp_mst.c 6 additions, 16 deletionsdrivers/gpu/drm/radeon/radeon_dp_mst.c
- drivers/gpu/drm/udl/udl_fb.c 2 additions, 2 deletionsdrivers/gpu/drm/udl/udl_fb.c
- drivers/staging/android/ion/ion.c 4 additions, 2 deletionsdrivers/staging/android/ion/ion.c
- include/linux/dma-buf.h 3 additions, 3 deletionsinclude/linux/dma-buf.h
- include/linux/fence.h 1 addition, 1 deletioninclude/linux/fence.h
Loading
Please register or sign in to comment