projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7fbd5d7
1c163f4
)
Merge v5.0 into drm-next
author
Dave Airlie
<airlied@redhat.com>
Mon, 4 Mar 2019 02:02:55 +0000
(12:02 +1000)
committer
Dave 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
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/bochs/bochs_drv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/drm_atomic_helper.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_fbdev.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
Simple merge
diff --cc
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
Simple merge
diff --cc
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
Simple merge
diff --cc
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
Simple merge
diff --cc
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Simple merge
diff --cc
drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c
Simple merge
diff --cc
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
Simple merge
diff --cc
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
Simple merge
diff --cc
drivers/gpu/drm/bochs/bochs_drv.c
Simple merge
diff --cc
drivers/gpu/drm/drm_atomic_helper.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_fbdev.c
Simple merge