Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 23 Jul 2021 13:08:18 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Alex Deucher <alexdeucher@gmail.com>,
        Dave Airlie <airlied@linux.ie>,
        DRI <dri-devel@lists.freedesktop.org>
Cc:     Alex Deucher <alexander.deucher@amd.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Stylon Wang <stylon.wang@amd.com>
Subject: Re: linux-next: manual merge of the amdgpu tree with the drm-fixes
 tree
Message-ID: <20210723130818.1a33137a@canb.auug.org.au>
In-Reply-To: <20210723125807.3c779f68@canb.auug.org.au>
References: <20210723125807.3c779f68@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/TQBcQZ487Tkwv/LKABop_Ae";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/TQBcQZ487Tkwv/LKABop_Ae
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 =3D DP_PANEL_MODE_DEFAULT;
> + 		}
>  -	} else
>  -		panel_mode =3D DP_PANEL_MODE_DEFAULT;
> + #endif

I corrected that to put back just the closing '}'.

--=20
Cheers,
Stephen Rothwell

--Sig_/TQBcQZ487Tkwv/LKABop_Ae
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmD6MqIACgkQAVBC80lX
0GzFjQf/ZusZ3vNUug4X6dFtIHKVLSoalBpVlvRCwj/RLimGfuPkQiqqOxWRVseb
05xkIYX76Mvk3N8Cy84kN128dZVG1uW0MQUtVCWcL4l+FQQySiZMH8erwA5dsrXO
lcLXD3W75s5HAdvvhgmTJacHn0ZpQI/mv5hAOsnLwB7TupZEYSdTFHtGoubpRNoa
uJdOXntoA0nxd3KmM/VsE9wn03tA0ff9QQoVCjB4zST1vogDG0dXtBFN4HGyslbU
Yw/xaibJS66n4fMAMFuvWb+EJGEJQholdQ78KWjKxPB3+AKcOCicXREvb3RXX++z
LrU1abJt+u92pvXN/JBcM0oT/oczYA==
=tUzc
-----END PGP SIGNATURE-----

--Sig_/TQBcQZ487Tkwv/LKABop_Ae--