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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 20 Feb 2025 12:28:32 +1100

Hi all,

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

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

between commit:

  b255ce4388e0 ("drm/amdgpu: don't change mode in amdgpu_dm_connector_mode_valid()")

from the drm tree and commit:

  cbf4890c6f28 ("drm/amd/display: Don't treat wb connector as physical in create_validate_stream_for_sink")

from the amdgpu 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 1ea40696c955,8672c0c3c5db..000000000000
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@@ -7476,9 -7536,11 +7536,12 @@@ enum drm_mode_status amdgpu_dm_connecto
  {
  	int result = MODE_ERROR;
  	struct dc_sink *dc_sink;
 +	struct drm_display_mode *test_mode;
  	/* TODO: Unhardcode stream count */
  	struct dc_stream_state *stream;
+ 	/* we always have an amdgpu_dm_connector here since we got
+ 	 * here via the amdgpu_dm_connector_helper_funcs
+ 	 */
  	struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
  
  	if ((mode->flags & DRM_MODE_FLAG_INTERLACE) ||
@@@ -7501,16 -7563,11 +7564,16 @@@
  		goto fail;
  	}
  
 -	drm_mode_set_crtcinfo(mode, 0);
 +	test_mode = drm_mode_duplicate(connector->dev, mode);
 +	if (!test_mode)
 +		goto fail;
  
 -	stream = create_validate_stream_for_sink(connector, mode,
 +	drm_mode_set_crtcinfo(test_mode, 0);
 +
- 	stream = create_validate_stream_for_sink(aconnector, test_mode,
++	stream = create_validate_stream_for_sink(connector, test_mode,
  						 to_dm_connector_state(connector->state),
  						 NULL);
 +	drm_mode_destroy(connector->dev, test_mode);
  	if (stream) {
  		dc_stream_release(stream);
  		result = MODE_OK;