OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3ec0af7
09ef237
)
Merge airlied/drm-next into drm-intel-next-queued
author
Daniel Vetter
<daniel.vetter@ffwll.ch>
Thu, 10 Aug 2017 16:12:01 +0000
(18:12 +0200)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Thu, 10 Aug 2017 16:12:01 +0000
(18:12 +0200)
Ben Widawsky/Daniel Stone need the extended modifier support from
drm-misc to be able to merge CCS support for i915.ko
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
1
2
drivers/gpu/drm/drm_atomic_helper.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_drv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_display.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_drv.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_fbdev.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_hdmi.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_sdvo.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_sprite.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/gpu/drm/drm_atomic_helper.c
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_drv.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_display.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_drv.h
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_fbdev.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_hdmi.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_sdvo.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_sprite.c
Simple merge