Received-SPF: pass (google.com: domain of linux-kernel+bounces-20209-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Tue, 9 Jan 2024 11:22:54 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>, Jani Nikula
 <jani.nikula@linux.intel.com>, Joonas Lahtinen
 <joonas.lahtinen@linux.intel.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>,
 Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI
 <dri-devel@lists.freedesktop.org>
Cc: Bjorn Andersson <andersson@kernel.org>, Bjorn Andersson
 <bjorn.andersson@linaro.org>, Dmitry Baryshkov
 <dmitry.baryshkov@linaro.org>, Imre Deak <imre.deak@intel.com>, Linux
 Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the drm-intel tree with Linus' tree
Message-ID: <20240109112254.405d3a1a@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/F6i/J4=GGUHLZ+nz4EgeNZT";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/F6i/J4=GGUHLZ+nz4EgeNZT
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/gpu/drm/i915/display/intel_dp.c

between commit:

  fc93835bb0d7 ("drm: Add HPD state to drm_connector_oob_hotplug_event()")

from Linus' tree and commit:

  cd572b3bb27e ("drm/i915: Disable hotplug detection works during driver in=
it/shutdown")

from the drm-intel tree.

I fixed it up (maybe, 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/i915/display/intel_dp.c
index 7d2b8ce48fda,93f9985ef75c..000000000000
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@@ -6040,21 -6062,11 +6059,21 @@@ static void intel_dp_oob_hotplug_event(
  {
  	struct intel_encoder *encoder =3D intel_attached_encoder(to_intel_connec=
tor(connector));
  	struct drm_i915_private *i915 =3D to_i915(connector->dev);
 +	bool hpd_high =3D hpd_state =3D=3D connector_status_connected;
 +	unsigned int hpd_pin =3D encoder->hpd_pin;
 +	bool need_work =3D false;
 =20
  	spin_lock_irq(&i915->irq_lock);
 -	i915->display.hotplug.event_bits |=3D BIT(encoder->hpd_pin);
 +	if (hpd_high !=3D test_bit(hpd_pin, &i915->display.hotplug.oob_hotplug_l=
ast_state)) {
 +		i915->display.hotplug.event_bits |=3D BIT(hpd_pin);
 +
 +		__assign_bit(hpd_pin, &i915->display.hotplug.oob_hotplug_last_state, hp=
d_high);
 +		need_work =3D true;
 +	}
  	spin_unlock_irq(&i915->irq_lock);
 -	intel_hpd_schedule_detection(i915);
 +
 +	if (need_work)
- 		queue_delayed_work(i915->unordered_wq, &i915->display.hotplug.hotplug_w=
ork, 0);
++		intel_hpd_schedule_detection(i915);
  }
 =20
  static const struct drm_connector_funcs intel_dp_connector_funcs =3D {

--Sig_/F6i/J4=GGUHLZ+nz4EgeNZT
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWckd4ACgkQAVBC80lX
0GzYLwf+Isd77XQw1RHb/jBROdv03anaJyjS77VZaazYNSZGn6V1/e79k5G8W35/
0LurPYJsdakjsCBzyRECIXsoO+o6hjWKPcDgeqjYPWHUfD39AHJyTNSja10o1Aio
Q1p2RafGPIqBpFZ3KYzJFVTCXdqFGgecMTFyoXSmGzgPgIOJDgnp9FLNXYwpUDFD
qRxmUe4XmV5/Ja56EoHDsxFk1dcgzLTO9FXPhjl4+mNlgd+W58ertRmrwOzD+jyy
bFMaWPS8sa9seWATnWhRzrW3FrSiy/ffhh+qbpl3rmf4mOifEoe3UhQyBqiFV2mu
V8nW3SCX9uhlE+mqYrVJ5B9M5LmO6w==
=kBR4
-----END PGP SIGNATURE-----

--Sig_/F6i/J4=GGUHLZ+nz4EgeNZT--