Hi all,

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

  drivers/gpu/drm/i915/display/intel_dp_mst.c

between commit:

  69b3d8721267 ("drm/i915/dp_mst: Handle error during DSC BW overhead/slice calculation")

from the drm-fixes tree and commit:

  f2e2092a979c ("drm/i915/display: Use joined pipes in dsc helpers for slices, bpp")

from the drm 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/display/intel_dp_mst.c
index eeaedd979354,4765bda154c1..000000000000
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@@ -147,19 -156,6 +148,19 @@@ static int intel_dp_mst_calc_pbn(int pi
  	return DIV_ROUND_UP(effective_data_rate * 64, 54 * 1000);
  }
  
 +static int intel_dp_mst_dsc_get_slice_count(const struct intel_connector *connector,
 +					    const struct intel_crtc_state *crtc_state)
 +{
 +	const struct drm_display_mode *adjusted_mode =
 +		&crtc_state->hw.adjusted_mode;
- 	int num_joined_pipes = crtc_state->joiner_pipes;
++	int num_joined_pipes = intel_crtc_num_joined_pipes(crtc_state);
 +
 +	return intel_dp_dsc_get_slice_count(connector,
 +					    adjusted_mode->clock,
 +					    adjusted_mode->hdisplay,
 +					    num_joined_pipes);
 +}
 +
  static int intel_dp_mst_find_vcpi_slots_for_bpp(struct intel_encoder *encoder,
  						struct intel_crtc_state *crtc_state,
  						int max_bpp,