linux-next: manual merge of the drm-intel tree with the drm-intel-fixes trees - dri-devel - freedesktop.org experimental mailing list

9 Jul 2015

Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/intel_display.c
between commits:
63fef06ada94 ("drm/i915: Check crtc->active in intel_crtc_disable_planes")
  dec4f799d0a4 ("drm/i915: Use crtc_state->active in primary check_plane func")
from the drm-intel-fixes tree and commit:
a539205a1628 ("drm/i915: atomic plane updates in a nutshell")
  da20eabd2c69 ("drm/i915: Split plane updates of crtc->atomic into a helper, v2.")
from the drm-intel tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/gpu/drm/i915/intel_display.c
index ba9321998a41,4bcbff9793d4..000000000000

--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -4851,25 -4800,13 +4800,16 @@@ static void intel_crtc_disable_planes(s
  {
    struct drm_device *dev = crtc->dev;
    struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
- 	struct intel_plane *intel_plane;
+ 	struct drm_plane *p;
    int pipe = intel_crtc->pipe;

 +	if (!intel_crtc->active)
 +		return;
 +
- 	intel_crtc_wait_for_pending_flips(crtc);
- 
- 	intel_pre_disable_primary(crtc);
- 
    intel_crtc_dpms_overlay_disable(intel_crtc);
- 	for_each_intel_plane(dev, intel_plane) {
- 		if (intel_plane->pipe == pipe) {
- 			struct drm_crtc *from = intel_plane->base.crtc;

- 			intel_plane->disable_plane(&intel_plane->base,
- 						   from ?: crtc, true);
- 		}
- 	}
+ 	drm_for_each_plane_mask(p, dev, plane_mask)
+ 		to_intel_plane(p)->disable_plane(p, crtc);

    /*
     * FIXME: Once we grow proper nuclear flip support out of this we need

    