On Tue, Jul 14, 2015 at 12:11:12PM +1000, Stephen Rothwell wrote:

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in:

drivers/gpu/drm/i915/intel_display.c

between commit:

8aa3053bf731 ("drm/i915: fix oops in primary_check_plane")

from the drm-intel-fixes tree and commit:

da20eabd2c69 ("drm/i915: Split plane updates of crtc->atomic into a helper, v2.")

from the drm-intel tree.

I fixed it up (but it probably needs more - see below) and can carry the fix as necessary.

Daniel, can you please merge your fixes branch into your main branch (maybe after Linus has merged it) and fix these conflicts correctly as these conflicts tend to go on and on as the files get changed.

Well the problem is that they indeed go on and on and we still change them so they resurface all the time. I've done a few backmerges in my next branch already, I plan to do the next backmerge somewhen this week.

Sorry about all the pain this is causing. -Daniel

-- Cheers, Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/gpu/drm/i915/intel_display.c index 85ac6d85dc39,00c60c1c5162..000000000000 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@@ -4851,25 -4802,13 +4802,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

@@@ -13382,47 -13751,11 +13757,14 @@@ static void intel_begin_crtc_commit(str struct drm_device *dev = crtc->dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

• struct intel_plane *intel_plane;

• struct drm_plane *p;

• unsigned fb_bits = 0;

• /* Track fb's for any planes being disabled */

• list_for_each_entry(p, &dev->mode_config.plane_list, head) {

• intel_plane = to_intel_plane(p);
  

• if (intel_crtc->atomic.disabled_planes &
  

•     (1 << drm_plane_index(p))) {
  

• 	switch (p->type) {
  

• 	case DRM_PLANE_TYPE_PRIMARY:
  

• 		fb_bits = INTEL_FRONTBUFFER_PRIMARY(intel_plane->pipe);
  

• 		break;
  

• 	case DRM_PLANE_TYPE_CURSOR:
  

• 		fb_bits = INTEL_FRONTBUFFER_CURSOR(intel_plane->pipe);
  

• 		break;
  

• 	case DRM_PLANE_TYPE_OVERLAY:
  

• 		fb_bits = INTEL_FRONTBUFFER_SPRITE(intel_plane->pipe);
  

• 		break;
  

• 	}
  
  

• 	mutex_lock(&dev->struct_mutex);
  

• 	i915_gem_track_fb(intel_fb_obj(p->fb), NULL, fb_bits);
  

• 	mutex_unlock(&dev->struct_mutex);
  

• }
  

• }

• if (intel_crtc->atomic.wait_for_flips)

• intel_crtc_wait_for_pending_flips(crtc);
  

• if (intel_crtc->atomic.disable_fbc)

• intel_fbc_disable(dev);
  

• if (!needs_modeset(crtc->state))

• intel_pre_plane_update(intel_crtc);
  
  

• if (intel_crtc->atomic.disable_ips)

• hsw_disable_ips(intel_crtc);
  

• if (intel_crtc->atomic.pre_disable_primary)

• intel_pre_disable_primary(crtc);
  

• if (intel_crtc->atomic.update_wm)

• if (intel_crtc->atomic.update_wm_pre) intel_update_watermarks(crtc);

  intel_runtime_pm_get(dev_priv);