Merge drm/drm-next into drm-misc-next
Backmerging to pick up the latest TTM patches plus conflict resolution.
Signed-off-by:
Thomas Zimmermann <tzimmermann@suse.de>
No related branches found
No related tags found
Showing
- Documentation/gpu/amdgpu.rst 21 additions, 0 deletionsDocumentation/gpu/amdgpu.rst
- Documentation/gpu/driver-uapi.rst 8 additions, 0 deletionsDocumentation/gpu/driver-uapi.rst
- Documentation/gpu/i915.rst 6 additions, 6 deletionsDocumentation/gpu/i915.rst
- Documentation/gpu/index.rst 1 addition, 0 deletionsDocumentation/gpu/index.rst
- Documentation/gpu/rfc/i915_gem_lmem.rst 131 additions, 0 deletionsDocumentation/gpu/rfc/i915_gem_lmem.rst
- Documentation/gpu/rfc/index.rst 4 additions, 0 deletionsDocumentation/gpu/rfc/index.rst
- arch/x86/kernel/early-quirks.c 1 addition, 0 deletionsarch/x86/kernel/early-quirks.c
- drivers/gpu/drm/amd/amdgpu/Makefile 5 additions, 4 deletionsdrivers/gpu/drm/amd/amdgpu/Makefile
- drivers/gpu/drm/amd/amdgpu/aldebaran.c 1 addition, 1 deletiondrivers/gpu/drm/amd/amdgpu/aldebaran.c
- drivers/gpu/drm/amd/amdgpu/amdgpu.h 38 additions, 19 deletionsdrivers/gpu/drm/amd/amdgpu/amdgpu.h
- drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c 262 additions, 126 deletionsdrivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h 1 addition, 1 deletiondrivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c 21 additions, 21 deletionsdrivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c
- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c 27 additions, 27 deletionsdrivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c
- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c 20 additions, 15 deletionsdrivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c 8 additions, 23 deletionsdrivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c 26 additions, 15 deletionsdrivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c 2 additions, 2 deletionsdrivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 67 additions, 5 deletionsdrivers/gpu/drm/amd/amdgpu/amdgpu_device.c
- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c 2 additions, 2 deletionsdrivers/gpu/drm/amd/amdgpu/amdgpu_display.c
Loading
Please register or sign in to comment