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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_dp.c between commit 9d1a455b0ca1 ("") from
Linus' tree and commit 965e0c489f36 ("drm/i915: introduce
pipe_config->dither|pipe_bpp") 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_dp.c
index d7d4afe,92a7c62..0000000
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -850,10 -792,10 +802,10 @@@ intel_dp_set_m_n(struct drm_crtc *crtc
  	 * the number of bytes_per_pixel post-LUT, which we always
  	 * set up for 8-bits of R/G/B, or 3 bytes total.
  	 */
- 	intel_link_compute_m_n(intel_crtc->bpp, lane_count,
+ 	intel_link_compute_m_n(intel_crtc->config.pipe_bpp, lane_count,
 -			       mode->clock, adjusted_mode->clock, &m_n);
 +			       target_clock, adjusted_mode->clock, &m_n);
  
- 	if (IS_HASWELL(dev)) {
+ 	if (HAS_DDI(dev)) {
  		I915_WRITE(PIPE_DATA_M1(cpu_transcoder),
  			   TU_SIZE(m_n.tu) | m_n.gmch_m);
  		I915_WRITE(PIPE_DATA_N1(cpu_transcoder), m_n.gmch_n);
-------------- 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/20130402/c1e13c2d/attachment.pgp>