projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
583fa4e
4c2e07c
)
Back-merge tag 'v4.7-rc5' into drm-next
author
Dave Airlie
<airlied@redhat.com>
Sat, 2 Jul 2016 05:56:01 +0000
(15:56 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Sat, 2 Jul 2016 05:56:01 +0000
(15:56 +1000)
Linux 4.7-rc5
The fsl-dcu pull needs -rc3 so go to -rc5 for now.
23 files changed:
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
Makefile
patch
|
diff1
|
diff2
|
blob
|
history
arch/arc/boot/dts/nsimosci.dts
patch
|
diff1
|
diff2
|
blob
|
history
arch/arc/boot/dts/nsimosci_hs.dts
patch
|
diff1
|
diff2
|
blob
|
history
arch/arc/boot/dts/nsimosci_hs_idu.dts
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/amdgpu/amdgpu.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/drm_atomic.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/drm_crtc_helper.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_dp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_drv.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_fbc.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/msm/msm_fbdev.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/omapdrm/dss/dsi.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/omapdrm/dss/hdmi5.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/radeon/atombios_crtc.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/sun4i/sun4i_drv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/sun4i/sun4i_rgb.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/vc4/vc4_crtc.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/vc4/vc4_drv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/vc4/vc4_kms.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
Makefile
Simple merge
diff --cc
arch/arc/boot/dts/nsimosci.dts
Simple merge
diff --cc
arch/arc/boot/dts/nsimosci_hs.dts
Simple merge
diff --cc
arch/arc/boot/dts/nsimosci_hs_idu.dts
Simple merge
diff --cc
drivers/gpu/drm/amd/amdgpu/amdgpu.h
Simple merge
diff --cc
drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
Simple merge
diff --cc
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
Simple merge
diff --cc
drivers/gpu/drm/drm_atomic.c
Simple merge
diff --cc
drivers/gpu/drm/drm_crtc_helper.c
Simple merge
diff --cc
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_dp.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_drv.h
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_fbc.c
index
ecabd59
,
647127f
..
a19944b
---
1
/
drivers/gpu/drm/i915/intel_fbc.c
---
2
/
drivers/gpu/drm/i915/intel_fbc.c
+++ b/
drivers/gpu/drm/i915/intel_fbc.c
@@@
-818,10
-824,9
+818,9
@@@
static bool intel_fbc_can_choose(struc
{
struct drm_i915_private *dev_priv = crtc->base.dev->dev_private;
struct intel_fbc *fbc = &dev_priv->fbc;
- bool enable_by_default = IS_HASWELL(dev_priv) ||
- IS_BROADWELL(dev_priv);
+ bool enable_by_default = IS_BROADWELL(dev_priv);
- if (intel_vgpu_active(dev_priv
->dev
)) {
+ if (intel_vgpu_active(dev_priv)) {
fbc->no_fbc_reason = "VGPU is active";
return false;
}
diff --cc
drivers/gpu/drm/msm/msm_fbdev.c
Simple merge
diff --cc
drivers/gpu/drm/omapdrm/dss/dsi.c
Simple merge
diff --cc
drivers/gpu/drm/omapdrm/dss/hdmi5.c
Simple merge
diff --cc
drivers/gpu/drm/radeon/atombios_crtc.c
Simple merge
diff --cc
drivers/gpu/drm/sun4i/sun4i_drv.c
Simple merge
diff --cc
drivers/gpu/drm/sun4i/sun4i_rgb.c
Simple merge
diff --cc
drivers/gpu/drm/vc4/vc4_crtc.c
Simple merge
diff --cc
drivers/gpu/drm/vc4/vc4_drv.c
Simple merge
diff --cc
drivers/gpu/drm/vc4/vc4_kms.c
Simple merge