| Message ID | 20210723125807.3c779f68@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the amdgpu tree with the drm-fixes tree | expand |
Hi all, On Fri, 23 Jul 2021 12:58:07 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > + #ifdef CONFIG_DRM_AMD_DC_HDCP > + if (cp_psp && cp_psp->funcs.enable_assr) { > + if (!cp_psp->funcs.enable_assr(cp_psp->handle, link)) { > + /* since eDP implies ASSR on, change panel > + * mode to disable ASSR > + */ > + panel_mode = DP_PANEL_MODE_DEFAULT; > + } > - } else > - panel_mode = DP_PANEL_MODE_DEFAULT; > + #endif I corrected that to put back just the closing '}'.
diff --cc drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c index 9fb8c46dc606,036a87af6c5b..000000000000 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c between commit: 6be50f5d83ad ("drm/amd/display: Fix ASSR regression on embedded panels") from the drm-fixes tree and commit: fb85f280bf40 ("drm/amd/display: Re-enable "Guard ASSR with internal display flag"") 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.