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_cdclk.c

between commit:

  30414f3010af ("drm/i915: Apply Display WA #1183 on skl, kbl, and cfl")

from the drm-intel-fixes tree and commit:

  2aa97491da8a ("drm/i915: Use cdclk_state->voltage on SKL/KBL/CFL")

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_cdclk.c
index 60cf4e58389a,9c5ceb98d48f..000000000000
--- a/drivers/gpu/drm/i915/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/intel_cdclk.c
@@@ -917,11 -994,9 +988,9 @@@ static void skl_set_cdclk(struct drm_i9
  {
  	int cdclk = cdclk_state->cdclk;
  	int vco = cdclk_state->vco;
- 	u32 freq_select, pcu_ack, cdclk_ctl;
 -	u32 freq_select;
++	u32 freq_select, cdclk_ctl;
  	int ret;
  
- 	WARN_ON((cdclk == 24000) != (vco == 0));
- 
  	mutex_lock(&dev_priv->pcu_lock);
  	ret = skl_pcode_request(dev_priv, SKL_PCODE_CDCLK_CONTROL,
  				SKL_CDCLK_PREPARE_FOR_CHANGE,
@@@ -934,8 -1009,16 +1003,16 @@@
  		return;
  	}
  
 -	/* set CDCLK_CTL */
 +	/* Choose frequency for this cdclk */
  	switch (cdclk) {
+ 	default:
+ 		WARN_ON(cdclk != dev_priv->cdclk.hw.ref);
+ 		WARN_ON(vco != 0);
+ 		/* fall through */
+ 	case 308571:
+ 	case 337500:
+ 		freq_select = CDCLK_FREQ_337_308;
+ 		break;
  	case 450000:
  	case 432000:
  		freq_select = CDCLK_FREQ_450_432;