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:
6f15a7d
5007750
)
Merge drm/drm-next into drm-intel-next-queued
author
Rodrigo Vivi
<rodrigo.vivi@intel.com>
Mon, 23 Jul 2018 16:13:12 +0000
(09:13 -0700)
committer
Rodrigo Vivi
<rodrigo.vivi@intel.com>
Mon, 23 Jul 2018 16:13:12 +0000
(09:13 -0700)
We need a backmerge to get DP_DPCD_REV_14 before we push other
i915 changes to dinq that could break compilation.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1
2
drivers/gpu/drm/i915/i915_drv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_gem_gtt.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_display.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_dp_mst.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_dpll_mgr.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/gpu/drm/i915/i915_drv.c
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_gem_gtt.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_display.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_dp_mst.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_dpll_mgr.c
Simple merge