Subject: linux-next: manual merge of the drm tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 4 Jun 2018 13:09:00 +1000

Hi all,

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

  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

between commit:

  a9e8d27574f2 ("drm/amd/display: Make atomic-check validate underscan changes")

from Linus' tree and commit:

  dm_update_crtcs_state ("drm/amd/display: Couple formatting fixes")

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/amd/display/amdgpu_dm/amdgpu_dm.c
index 27579443cdc5,1ce10bc2d37b..000000000000
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@@ -4577,14 -4650,11 +4650,14 @@@ static int dm_update_crtcs_state(struc
  		/* TODO This hack should go away */
  		if (aconnector && enable) {
  			// Make sure fake sink is created in plug-in scenario
 -			new_con_state = drm_atomic_get_connector_state(state,
 +			drm_new_conn_state = drm_atomic_get_new_connector_state(state,
-  								    &aconnector->base);
+ 								    &aconnector->base);
 +			drm_old_conn_state = drm_atomic_get_old_connector_state(state,
 +								    &aconnector->base);
 +
  
 -			if (IS_ERR(new_con_state)) {
 -				ret = PTR_ERR_OR_ZERO(new_con_state);
 +			if (IS_ERR(drm_new_conn_state)) {
 +				ret = PTR_ERR_OR_ZERO(drm_new_conn_state);
  				break;
  			}