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

[Stephen Rothwell]

Hi all,

On Fri, 23 Jul 2021 12:58:07 +1000 Stephen Rothwell <sfr at 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 '}'.

-- 
Cheers,
Stephen Rothwell
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20210723/c0b8cf13/attachment.sig>