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

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the drm-misc tree with the drm-intel tree
Date	Tue, 03 Jan 2017 03:20:01 +0100
Message-ID	<sVmRH-7KD-1@gated-at.bofh.it> (permalink)
X-Original-To	Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1483409669; bh=mZXcIQRiaBw3WFcJayEsOAdw+Vc6Jwbg9V1NEczdWtk=; h=Date:From:To:Cc:Subject:From; b=Nw+VzJ0P8+oflySu+gTAh2NtHoNvhs4xxBqNVpyAS6cY4Toy/OmddmjEeUuOU+SGY SXMagzl2dBn5KQRdc5yV454sIy89rT0oZWfqWVW/CQBPDgyB58MRmwZMn2AZePfDV3 Fq5aWiZk7518/3Z91QvntfhIGQhdTArXuELgcbEg=
MIME-Version	1.0
Content-Type	text/plain; charset=US-ASCII
Content-Transfer-Encoding	7bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	51
Organization	linux.* mail to news gateway
X-Original-Cc	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ville Syrjälä <ville.syrjala@linux.intel.com>
X-Original-Date	Tue, 3 Jan 2017 13:14:28 +1100
X-Original-Message-ID	<20170103131428.64737315@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1549500

Show key headers only | View raw

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;

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the drm-misc tree with the drm-intel  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-01-03 03:20 +0100

csiph-web