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

From: Stephen Rothwell
Date: Thu May 18 2017 - 22:04:25 EST

Hi all,

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


between commit:

f424f55e3177 ("drm/i915: Track MST link bandwidth")

from the drm tree and commit:

3d65a735d834 ("drm/i915/mst: use max link not sink lane count")

from the drm-intel 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.

Stephen Rothwell

diff --cc drivers/gpu/drm/i915/intel_dp_mst.c
index 1dee9933005f,5af22a7c11bf..000000000000
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@@ -56,7 -56,8 +56,7 @@@ static bool intel_dp_mst_compute_config
* for MST we always configure max link bw - the spec doesn't
* seem to suggest we should do otherwise.
- lane_count = drm_dp_max_lane_count(intel_dp->dpcd);
+ lane_count = intel_dp_max_lane_count(intel_dp);
pipe_config->lane_count = lane_count;

pipe_config->pipe_bpp = bpp;