From: Oleksij Rempel Subject: Re: [PATCH] drm/i915: add hotplug activation period to hotplug update mask Date: Wed, 21 Oct 2015 20:28:54 +0200 Message-ID: <5627D966.6060707@rempel-privat.de> References: <1445437363-3030-1-git-send-email-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0743805778==" Return-path: Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7CB5F721F6 for ; Wed, 21 Oct 2015 11:29:16 -0700 (PDT) In-Reply-To: <1445437363-3030-1-git-send-email-jani.nikula@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Jani Nikula , intel-gfx@lists.freedesktop.org Cc: Egbert Eich , Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============0743805778== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="dRd9Mg58OBhmcd1NHtXRtoNep5sVRqEQq" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --dRd9Mg58OBhmcd1NHtXRtoNep5sVRqEQq Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, no more warnings with this patch. Thank you! Am 21.10.2015 um 16:22 schrieb Jani Nikula: > commit 0706f17c307b056ff6f1848320ba82d76945a6ff > Author: Egbert Eich > Date: Wed Sep 23 16:15:27 2015 +0200 >=20 > drm/i915: Avoid race of intel_crt_detect_hotplug() with HPD interru= pt, v2 >=20 > added a check with WARN to ensure only bits within the mask are > enabled. Turns out that doesn't hold for G4X, which spits out: >=20 > [ 2.641439] ------------[ cut here ]------------ > [ 2.641444] WARNING: CPU: 0 PID: 1 at drivers/gpu/drm/i915/i915_irq.= c:182 i915_hotplug_interrupt_update_locked+0x45/0x83() > [ 2.641446] WARN_ON(bits & ~mask) > etc. >=20 > Add CRT_HOTPLUG_ACTIVATION_PERIOD_64 to the mask to fix the warning. >=20 > Reported-by: Oleksij Rempel > References: https://bugzilla.kernel.org/show_bug.cgi?id=3D104991 > Fixes: 0706f17c307b ("drm/i915: Avoid race of intel_crt_detect_hotplug(= ) with HPD interrupt, v2") > Cc: Egbert Eich > Cc: Daniel Vetter > Signed-off-by: Jani Nikula > --- > drivers/gpu/drm/i915/i915_irq.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) >=20 > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i91= 5_irq.c > index 7f91f74961f4..5b9f63d4318b 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -4236,9 +4236,10 @@ static void i915_hpd_irq_setup(struct drm_device= *dev) > =20 > /* Ignore TV since it's buggy */ > i915_hotplug_interrupt_update_locked(dev_priv, > - (HOTPLUG_INT_EN_MASK > - | CRT_HOTPLUG_VOLTAGE_COMPARE_MASK), > - hotplug_en); > + HOTPLUG_INT_EN_MASK | > + CRT_HOTPLUG_VOLTAGE_COMPARE_MASK | > + CRT_HOTPLUG_ACTIVATION_PERIOD_64, > + hotplug_en); > } > =20 > static irqreturn_t i965_irq_handler(int irq, void *arg) >=20 --=20 Regards, Oleksij --dRd9Mg58OBhmcd1NHtXRtoNep5sVRqEQq Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iF4EAREIAAYFAlYn2W8ACgkQHwImuRkmbWlnygD/dBr04+h63D1hm0Uw6rCi0tWB g/uOmH+gXufOnrerfXYA/A9lUa2znitww8tZqNeZzXfcXCNpB9pB8UdPIhg0bnzV =jfbB -----END PGP SIGNATURE----- --dRd9Mg58OBhmcd1NHtXRtoNep5sVRqEQq-- --===============0743805778== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK --===============0743805778==--