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

[Stephen Rothwell]

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:

49f1c44b581b ("rm/amd/display: Fix unintialized max_bpc state values")

from the drm-fixes tree and commits:

c1ee92f94ce3 ("drm/amd: Add abm level drm property")
bb47de736661 ("drm/amdgpu: Set FreeSync state using drm VRR properties")

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 5a6edf65c9ea,32e791d9b9a8..000000000000
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@@ -3063,8 -3234,7 +3235,8 @@@ amdgpu_dm_connector_atomic_duplicate_st
__drm_atomic_helper_connector_duplicate_state(connector, &new_state->base);

new_state->freesync_capable = state->freesync_capable;
- new_state->freesync_enable = state->freesync_enable;
+ new_state->max_bpc = state->max_bpc;
+ new_state->abm_level = state->abm_level;

return &new_state->base;
}

[Stephen Rothwell]

Hi all,

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

drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c

between commit:

c6888879fd55 ("drm/amd/display: Fix 6x4K displays light-up on Vega20 (v2)")

from the drm-fixes tree and commit:

24f7dd7ea98d ("drm/amd/display: move pplib/smu notification to dccg block")

from the drm tree.

I fixed it up (I am not sure how to fix this up, so I just dropped the
drm-fixes change) 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.