From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lyude Paul Subject: [PATCH v4 1/8] drm/nouveau: Fix bogus drm_kms_helper_poll_enable() placement Date: Wed, 1 Aug 2018 17:14:51 -0400 Message-ID: <20180801211459.7731-2-lyude@redhat.com> References: <20180801211459.7731-1-lyude@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180801211459.7731-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: David Airlie , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Peter Ujfalusi , Ben Skeggs , stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: nouveau.vger.kernel.org VHVybnMgb3V0IHRoaXMgcGFydCBpcyBteSBmYXVsdCBmb3Igbm90IG5vdGljaW5nIHdoZW4gcmV2 aWV3aW5nCjlhMmViYTMzN2NhY2UgKCJkcm0vbm91dmVhdTogRml4IGRybSBwb2xsX2hlbHBlciBo YW5kbGluZyIpLiBDdXJyZW50bHkKd2UgY2FsbCBkcm1fa21zX2hlbHBlcl9wb2xsX2VuYWJsZSgp IGZyb20gbm91dmVhdV9kaXNwbGF5X2hwZF93b3JrKCkuClRoaXMgbWFrZXMgYmFzaWNhbGx5IG5v IHNlbnNlIGhvd2V2ZXIsIGJlY2F1c2UgdGhhdCBtZWFucyB3ZSdyZSBjYWxsaW5nCmRybV9rbXNf aGVscGVyX3BvbGxfZW5hYmxlKCkgZXZlcnkgdGltZSB3ZSBzY2hlZHVsZSB0aGUgaG90cGx1Zwpk ZXRlY3Rpb24gd29yay4gVGhpcyBpcyBhbHNvIGFnYWluc3QgdGhlIGFkdmljZSBtZW50aW9uZWQg aW4KZHJtX2ttc19oZWxwZXJfcG9sbF9lbmFibGUoKSdzIGRvY3VtZW50YXRpb246CgogTm90ZSB0 aGF0IGNhbGxzIHRvIGVuYWJsZSBhbmQgZGlzYWJsZSBwb2xsaW5nIG11c3QgYmUgc3RyaWN0bHkg b3JkZXJlZCwKIHdoaWNoIGlzIGF1dG9tYXRpY2FsbHkgdGhlIGNhc2Ugd2hlbiB0aGV5J3JlIG9u bHkgY2FsbCBmcm9tCiBzdXNwZW5kL3Jlc3VtZSBjYWxsYmFja3MuCgpPZiBjb3Vyc2UsIGhvdHBs dWdzIGNhbid0IHJlYWxseSBiZSBvcmRlcmVkLiBUaGV5IGNvdWxkIGV2ZW4gaGFwcGVuCmltbWVk aWF0ZWx5IGFmdGVyIHdlIGNhbGxlZCBkcm1fa21zX2hlbHBlcl9wb2xsX2Rpc2FibGUoKSBpbgpu b3V2ZWF1X2Rpc3BsYXlfZmluaSgpLCB3aGljaCBjYW4gbGVhZCB0byBhbGwgc29ydHMgb2YgaXNz dWVzLgoKQWRkaXRpb25hbGx5OyBlbmFibGluZyBwb2xsaW5nIC9hZnRlci8gd2UgY2FsbApkcm1f aGVscGVyX2hwZF9pcnFfZXZlbnQoKSBjb3VsZCBhbHNvIG1lYW4gdGhhdCB3ZSdkIG1pc3MgYSBo b3RwbHVnCmV2ZW50IGFueXdheSwgc2luY2UgZHJtX2hlbHBlcl9ocGRfaXJxX2V2ZW50KCkgd291 bGRuJ3QgYm90aGVyIHRyeWluZyB0bwpwcm9iZSBjb25uZWN0b3JzIHNvIGxvbmcgYXMgcG9sbGlu ZyBpcyBkaXNhYmxlZC4KClNvOyBzaW1wbHkgbW92ZSB0aGlzIGJhY2sgaW50byBub3V2ZWF1X2Rp c3BsYXlfaW5pdCgpIGFnYWluLiBUaGUgcmFjZQpjb25kaXRpb24gdGhhdCBib3RoIG9mIHRoZXNl IHBhdGNoZXMgYXR0ZW1wdGVkIHRvIHdvcmsgYXJvdW5kIGhhcwphbHJlYWR5IGJlZW4gZml4ZWQg cHJvcGVybHkgaW4KCiAgZDYxYTVjMTA2MzUxICgiZHJtL25vdXZlYXU6IEZpeCBkZWFkbG9jayBv biBydW50aW1lIHN1c3BlbmQiKQoKRml4ZXM6IDlhMmViYTMzN2NhY2UgKCJkcm0vbm91dmVhdTog Rml4IGRybSBwb2xsX2hlbHBlciBoYW5kbGluZyIpClNpZ25lZC1vZmYtYnk6IEx5dWRlIFBhdWwg PGx5dWRlQHJlZGhhdC5jb20+CkNjOiBMdWthcyBXdW5uZXIgPGx1a2FzQHd1bm5lci5kZT4KQ2M6 IFBldGVyIFVqZmFsdXNpIDxwZXRlci51amZhbHVzaUB0aS5jb20+CkNjOiBzdGFibGVAdmdlci5r ZXJuZWwub3JnCi0tLQogZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9kaXNwbGF5LmMg fCA3ICsrKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfZHJtLmMgICAgIHwg MSAtCiAyIGZpbGVzIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2Rpc3BsYXkuYyBiL2Ry aXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfZGlzcGxheS5jCmluZGV4IGVjNzg2MTQ1N2I4 NC4uMWQzNmFiNWQ0Nzk2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2 ZWF1X2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2Rpc3Bs YXkuYwpAQCAtMzU1LDggKzM1NSw2IEBAIG5vdXZlYXVfZGlzcGxheV9ocGRfd29yayhzdHJ1Y3Qg d29ya19zdHJ1Y3QgKndvcmspCiAJcG1fcnVudGltZV9nZXRfc3luYyhkcm0tPmRldi0+ZGV2KTsK IAogCWRybV9oZWxwZXJfaHBkX2lycV9ldmVudChkcm0tPmRldik7Ci0JLyogZW5hYmxlIHBvbGxp bmcgZm9yIGV4dGVybmFsIGRpc3BsYXlzICovCi0JZHJtX2ttc19oZWxwZXJfcG9sbF9lbmFibGUo ZHJtLT5kZXYpOwogCiAJcG1fcnVudGltZV9tYXJrX2xhc3RfYnVzeShkcm0tPmRldi0+ZGV2KTsK IAlwbV9ydW50aW1lX3B1dF9zeW5jKGRybS0+ZGV2LT5kZXYpOwpAQCAtNDExLDYgKzQwOSwxMSBA QCBub3V2ZWF1X2Rpc3BsYXlfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChyZXQp CiAJCXJldHVybiByZXQ7CiAKKwkvKiBlbmFibGUgY29ubmVjdG9yIGRldGVjdGlvbiBhbmQgcG9s bGluZyBmb3IgY29ubmVjdG9ycyB3aXRob3V0IEhQRAorCSAqIHN1cHBvcnQKKwkgKi8KKwlkcm1f a21zX2hlbHBlcl9wb2xsX2VuYWJsZShkZXYpOworCiAJLyogZW5hYmxlIGhvdHBsdWcgaW50ZXJy dXB0cyAqLwogCWRybV9jb25uZWN0b3JfbGlzdF9pdGVyX2JlZ2luKGRldiwgJmNvbm5faXRlcik7 CiAJbm91dmVhdV9mb3JfZWFjaF9ub25fbXN0X2Nvbm5lY3Rvcl9pdGVyKGNvbm5lY3RvciwgJmNv bm5faXRlcikgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9k cm0uYyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfZHJtLmMKaW5kZXggYzdlYzg2 ZDZjM2M5Li41ZmRjMWZiZTJlZTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1 L25vdXZlYXVfZHJtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9kcm0u YwpAQCAtODM1LDcgKzgzNSw2IEBAIG5vdXZlYXVfcG1vcHNfcnVudGltZV9zdXNwZW5kKHN0cnVj dCBkZXZpY2UgKmRldikKIAkJcmV0dXJuIC1FQlVTWTsKIAl9CiAKLQlkcm1fa21zX2hlbHBlcl9w b2xsX2Rpc2FibGUoZHJtX2Rldik7CiAJbm91dmVhdV9zd2l0Y2hlcm9vX29wdGltdXNfZHNtKCk7 CiAJcmV0ID0gbm91dmVhdV9kb19zdXNwZW5kKGRybV9kZXYsIHRydWUpOwogCXBjaV9zYXZlX3N0 YXRlKHBkZXYpOwotLSAKMi4xNy4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpOb3V2ZWF1IG1haWxpbmcgbGlzdApOb3V2ZWF1QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL25v dXZlYXUK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AAA05C28CF6 for ; Wed, 1 Aug 2018 21:16:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 497F1208A3 for ; Wed, 1 Aug 2018 21:16:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 497F1208A3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731994AbeHAXC7 (ORCPT ); Wed, 1 Aug 2018 19:02:59 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:48558 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726880AbeHAXC6 (ORCPT ); Wed, 1 Aug 2018 19:02:58 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0F2C887A84; Wed, 1 Aug 2018 21:15:16 +0000 (UTC) Received: from malachite.bss.redhat.com (dhcp-10-20-1-11.bss.redhat.com [10.20.1.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 601F82026D68; Wed, 1 Aug 2018 21:15:15 +0000 (UTC) From: Lyude Paul To: nouveau@lists.freedesktop.org Cc: Lukas Wunner , Peter Ujfalusi , stable@vger.kernel.org, Ben Skeggs , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 1/8] drm/nouveau: Fix bogus drm_kms_helper_poll_enable() placement Date: Wed, 1 Aug 2018 17:14:51 -0400 Message-Id: <20180801211459.7731-2-lyude@redhat.com> In-Reply-To: <20180801211459.7731-1-lyude@redhat.com> References: <20180801211459.7731-1-lyude@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 01 Aug 2018 21:15:16 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 01 Aug 2018 21:15:16 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lyude@redhat.com' RCPT:'' Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Turns out this part is my fault for not noticing when reviewing 9a2eba337cace ("drm/nouveau: Fix drm poll_helper handling"). Currently we call drm_kms_helper_poll_enable() from nouveau_display_hpd_work(). This makes basically no sense however, because that means we're calling drm_kms_helper_poll_enable() every time we schedule the hotplug detection work. This is also against the advice mentioned in drm_kms_helper_poll_enable()'s documentation: Note that calls to enable and disable polling must be strictly ordered, which is automatically the case when they're only call from suspend/resume callbacks. Of course, hotplugs can't really be ordered. They could even happen immediately after we called drm_kms_helper_poll_disable() in nouveau_display_fini(), which can lead to all sorts of issues. Additionally; enabling polling /after/ we call drm_helper_hpd_irq_event() could also mean that we'd miss a hotplug event anyway, since drm_helper_hpd_irq_event() wouldn't bother trying to probe connectors so long as polling is disabled. So; simply move this back into nouveau_display_init() again. The race condition that both of these patches attempted to work around has already been fixed properly in d61a5c106351 ("drm/nouveau: Fix deadlock on runtime suspend") Fixes: 9a2eba337cace ("drm/nouveau: Fix drm poll_helper handling") Signed-off-by: Lyude Paul Cc: Lukas Wunner Cc: Peter Ujfalusi Cc: stable@vger.kernel.org --- drivers/gpu/drm/nouveau/nouveau_display.c | 7 +++++-- drivers/gpu/drm/nouveau/nouveau_drm.c | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index ec7861457b84..1d36ab5d4796 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -355,8 +355,6 @@ nouveau_display_hpd_work(struct work_struct *work) pm_runtime_get_sync(drm->dev->dev); drm_helper_hpd_irq_event(drm->dev); - /* enable polling for external displays */ - drm_kms_helper_poll_enable(drm->dev); pm_runtime_mark_last_busy(drm->dev->dev); pm_runtime_put_sync(drm->dev->dev); @@ -411,6 +409,11 @@ nouveau_display_init(struct drm_device *dev) if (ret) return ret; + /* enable connector detection and polling for connectors without HPD + * support + */ + drm_kms_helper_poll_enable(dev); + /* enable hotplug interrupts */ drm_connector_list_iter_begin(dev, &conn_iter); nouveau_for_each_non_mst_connector_iter(connector, &conn_iter) { diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index c7ec86d6c3c9..5fdc1fbe2ee5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -835,7 +835,6 @@ nouveau_pmops_runtime_suspend(struct device *dev) return -EBUSY; } - drm_kms_helper_poll_disable(drm_dev); nouveau_switcheroo_optimus_dsm(); ret = nouveau_do_suspend(drm_dev, true); pci_save_state(pdev); -- 2.17.1