linux-next: manual merge of the drm-intel tree with the drm tree

[Stephen Rothwell]

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 f4510a2752b7 ("drm:
Replace crtc fb with primary plane fb (v3)") from the drm tree and commit
262ca2b08fbd ("drm/i915: Rename similar plane functions to avoid
confusion") 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 at canb.auug.org.au

diff --cc drivers/gpu/drm/i915/intel_display.c
index 3ffe5a6124f1,c31c6203c7ca..000000000000
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -2291,9 -2398,11 +2398,11 @@@ void intel_display_handle_reset(struct 
  		 * disabling them without disabling the entire crtc) allow again
  		 * a NULL crtc->fb.
  		 */
 -		if (intel_crtc->active && crtc->fb)
 +		if (intel_crtc->active && crtc->primary->fb)
- 			dev_priv->display.update_plane(crtc, crtc->primary->fb,
- 						       crtc->x, crtc->y);
+ 			dev_priv->display.update_primary_plane(crtc,
 -							       crtc->fb,
++							       crtc->primary->fb,
+ 							       crtc->x,
+ 							       crtc->y);
  		mutex_unlock(&crtc->mutex);
  	}
  }
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20140403/f87e4707/attachment.sig>