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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 23 Jul 2021 13:08:18 +1000

Hi all,

On Fri, 23 Jul 2021 12:58:07 +1000 Stephen Rothwell <[email-masked]> 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