Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 16 Nov 2022 10:57:02 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Daniel Vetter <daniel.vetter@ffwll.ch>,
        Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>
Cc:     =?UTF-8?B?Sm9zw6kgRXhww7NzaXRv?= <jose.exposito89@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Maxime Ripard <maxime@cerno.tech>
Subject: linux-next: manual merge of the drm-misc tree with the origin tree
Message-ID: <20221116105702.746ce3cf@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/P12Sa_2We=6e8ciHH2y4_Od";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/P12Sa_2We=6e8ciHH2y4_Od
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/gpu/drm/vc4/vc4_hdmi.c

between commit:

  682f99b8ae88 ("drm/vc4: hdmi: Take our lock to reset the link")

from the origin tree and commits:

  d218750805a3 ("drm/vc4: hdmi: Pass vc4_hdmi to vc4_hdmi_supports_scrambli=
ng()")
  0a99962c0dbf ("drm/vc4: hdmi: Fix pointer dereference before check")

from the drm-misc 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.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
index d7fcc7a4c082,6b223a5fcf6f..000000000000
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@@ -349,12 -348,9 +348,13 @@@ static int vc4_hdmi_reset_link(struct d
  	if (!crtc_state->active)
  		return 0;
 =20
 +	mutex_lock(&vc4_hdmi->mutex);
 +
- 	if (!vc4_hdmi_supports_scrambling(encoder)) {
+ 	vc4_hdmi =3D connector_to_vc4_hdmi(connector);
 -	if (!vc4_hdmi_supports_scrambling(vc4_hdmi))
++	if (!vc4_hdmi_supports_scrambling(vc4_hdmi)) {
 +		mutex_unlock(&vc4_hdmi->mutex);
  		return 0;
 +	}
 =20
  	scrambling_needed =3D vc4_hdmi_mode_needs_scrambling(&vc4_hdmi->saved_ad=
justed_mode,
  							   vc4_hdmi->output_bpc,

--Sig_/P12Sa_2We=6e8ciHH2y4_Od
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmN0J04ACgkQAVBC80lX
0GwRaQf/Q8h2ktVV7CYeiKNBoJU9zX+j/yv9PTNMbMzO8mTbb4ahk9s3SYINU4LC
6hkdaOsDeAaGtPCETYDJEirGMh12PRtgUIKAyHcm4MJSazMQnJo8MaO3ZpONw452
P7twC11nUDolbgOkYOU35YHvkD1b11l1XFWj3OR8rndF74AKv6uMpt4Dr6L96NhC
3037MLMBoKgn4H9SCTY7MkGbEtQ74v/oRIPMjcN3p1a6sqbJusq/gAH4W6Hl+JqJ
CalnbdgwPCVt7PnvPq9lcfZoSyK6J2hF5BP9keO1KdsaQ7y+Bzv0Pgfcmdhg/Q4e
GrammVlfft+eJo1asqQEfpl0K4MGXA==
=2tJB
-----END PGP SIGNATURE-----

--Sig_/P12Sa_2We=6e8ciHH2y4_Od--