OSDN Git Service

Merge v5.0 into drm-next
authorDave Airlie <airlied@redhat.com>
Mon, 4 Mar 2019 02:02:55 +0000 (12:02 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 4 Mar 2019 02:02:55 +0000 (12:02 +1000)
There is a really hairy resolution involving amdgpu fixes, that I'd rather confirm here.

Also some misc fixes are landed by me, but the pr has them as well.

Signed-off-by: Dave Airlie <airlied@redhat.com>
12 files changed:
1  2 
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
drivers/gpu/drm/bochs/bochs_drv.c
drivers/gpu/drm/drm_atomic_helper.c
drivers/gpu/drm/i915/intel_fbdev.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge