Received-SPF: pass (google.com: domain of linux-kernel+bounces-54134-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Tue, 6 Feb 2024 11:59:56 +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: Dario Binacchi <dario.binacchi@amarulasolutions.com>, Inki Dae
 <inki.dae@samsung.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Michael Trimarchi
 <michael@amarulasolutions.com>, Michael Walle <mwalle@kernel.org>, Robert
 Foss <rfoss@kernel.org>
Subject: linux-next: manual merge of the drm-misc tree with Linus' tree
Message-ID: <20240206115956.4570e9b1@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/tPTwWSbcHW7JIIhlh82ZBYM";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/tPTwWSbcHW7JIIhlh82ZBYM
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/bridge/samsung-dsim.c

between commit:

  ff3d5d04db07 ("drm: bridge: samsung-dsim: Don't use FORCE_STOP_STATE")

from Linus' tree and commit:

  b2fe2292624a ("drm: bridge: samsung-dsim: enter display mode in the enabl=
e() callback")

from the drm-misc tree.

I fixed it up (see below, please check) 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/bridge/samsung-dsim.c
index 6a10aa5c85f5,f9d85fe1df7e..000000000000
--- a/drivers/gpu/drm/bridge/samsung-dsim.c
+++ b/drivers/gpu/drm/bridge/samsung-dsim.c
@@@ -1498,6 -1526,11 +1503,8 @@@ static void samsung_dsim_atomic_disable
  	if (!(dsi->state & DSIM_STATE_ENABLED))
  		return;
 =20
 -	if (!samsung_dsim_hw_is_exynos(dsi->plat_data->hw_type))
 -		samsung_dsim_set_stop_state(dsi, true);
 -
+ 	samsung_dsim_set_display_enable(dsi, false);
+=20
  	dsi->state &=3D ~DSIM_STATE_VIDOUT_AVAILABLE;
  }
 =20

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXBhIwACgkQAVBC80lX
0GzXoAgAjOU5PMyBhdNjxCGyusGWHf/88xGF2bb6y76E2cLHxWZmxOv/ayFBxgL9
2Sbbt44esyXM5DqMjeVXV8BxlOHKgXho2e4IwjQWSYqRL5sgv/ht2p3/4mD19KMM
jZ44WmMPe+j9O1AYhrgqVLspl/81Jw+WvvEbuAHdNO4BrFTqrl3Ukwep6d1Vqc4v
Ea6lci6qf+daL2U+ESCA6nHhNHM6Yn7kE0xliG7rQSX81u2MEAJVzdZou4RYhqzI
xYP/mU1oIVFiZkz4P1xUK/2uggpbt6F0a1OHzxyDEPQwCveaPAmwsbh1P21IJB0u
Ykh4PJBWNwddUdEtUwy1sncIOnausw==
=gUMH
-----END PGP SIGNATURE-----

--Sig_/tPTwWSbcHW7JIIhlh82ZBYM--