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

[Stephen Rothwell]

Hi all,

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

  drivers/gpu/drm/i915/intel_pm.c

between commit:

  9cc5bb18bd0a ("drm/i915: Fix bad comparison in skl_compute_plane_wm")

from the drm-intel-fixes tree and commit:

  eac2cb81fb87 ("drm/i915: cleanup fixed-point wrappers naming")

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/intel_pm.c
index 40b224b44d1b,ee2a349cfe68..000000000000
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@@ -4463,11 -4459,11 +4459,11 @@@ static int skl_compute_plane_wm(const s
  		if ((cpp * cstate->base.adjusted_mode.crtc_htotal / 512 < 1) &&
  		    (plane_bytes_per_line / 512 < 1))
  			selected_result = method2;
 -		else if ((ddb_allocation && ddb_allocation /
 -			fixed16_to_u32_round_up(plane_blocks_per_line)) >= 1)
 +		else if (ddb_allocation >=
- 			 fixed_16_16_to_u32_round_up(plane_blocks_per_line))
- 			selected_result = min_fixed_16_16(method1, method2);
++			 fixed16_to_u32_round_up(plane_blocks_per_line))
+ 			selected_result = min_fixed16(method1, method2);
  		else if (latency >= linetime_us)
- 			selected_result = min_fixed_16_16(method1, method2);
+ 			selected_result = min_fixed16(method1, method2);
  		else
  			selected_result = method1;
  	}