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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 3 Jan 2017 13:14:28 +1100

Hi all,

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

  drivers/gpu/drm/i915/intel_pm.c

between commit:

  e339d67eeb02 ("drm/i915: Pass crtc state to vlv_compute_wm_level()")

from the drm-intel tree and commit:

  353c85989963 ("drm: Replace drm_format_plane_cpp() with fb->format->cpp[]")

from the drm-misc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/intel_pm.c
index 4b12637e2084,ce03d9d5aca6..000000000000
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@@ -991,13 -960,13 +991,13 @@@ static uint16_t vlv_compute_wm_level(co
  	if (dev_priv->wm.pri_latency[level] == 0)
  		return USHRT_MAX;
  
 -	if (!state->base.visible)
 +	if (!plane_state->base.visible)
  		return 0;
  
- 	cpp = drm_format_plane_cpp(plane_state->base.fb->pixel_format, 0);
 -	cpp = state->base.fb->format->cpp[0];
 -	clock = crtc->config->base.adjusted_mode.crtc_clock;
 -	htotal = crtc->config->base.adjusted_mode.crtc_htotal;
 -	width = crtc->config->pipe_src_w;
++	cpp = plane_state->base.fb->format->cpp[0];
 +	clock = adjusted_mode->crtc_clock;
 +	htotal = adjusted_mode->crtc_htotal;
 +	width = crtc_state->pipe_src_w;
  	if (WARN_ON(htotal == 0))
  		htotal = 1;