From: Dave Airlie <airlied@redhat.com>
Date: Sat, 2 Jul 2016 05:56:01 +0000 (+1000)
Subject: Back-merge tag 'v4.7-rc5' into drm-next
X-Git-Tag: v4.8~318^2~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=542d972221e024681b502033154f917c1455469f;p=platform%2Fkernel%2Flinux-amlogic.git

Back-merge tag 'v4.7-rc5' into drm-next

Linux 4.7-rc5

The fsl-dcu pull needs -rc3 so go to -rc5 for now.
---

542d972221e024681b502033154f917c1455469f
diff --cc drivers/gpu/drm/i915/intel_fbc.c
index ecabd59,647127f..a19944b
--- a/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;
  	}