From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schake Subject: [PATCH 2/2] drm/vc4: Ensure interrupts are disabled Date: Fri, 10 Nov 2017 02:05:07 +0100 Message-ID: <1510275907-993-3-git-send-email-stschake@gmail.com> References: <1510275907-993-1-git-send-email-stschake@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8EE3D6E9CD for ; Fri, 10 Nov 2017 01:05:51 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id t139so21177705wmt.1 for ; Thu, 09 Nov 2017 17:05:51 -0800 (PST) In-Reply-To: <1510275907-993-1-git-send-email-stschake@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: David Airlie , linux-rpi-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Stefan Schake List-Id: dri-devel@lists.freedesktop.org VGhlIG92ZXJmbG93IG1lbSB3b3JrIGNhbGxiYWNrIHZjNF9vdmVyZmxvd19tZW1fd29yayByZWVu YWJsZXMgaXRzCmFzc29jaWF0ZWQgaW50ZXJydXB0IHVwb24gY29tcGxldGlvbi4gVG8gZW5zdXJl IGFsbCBpbnRlcnJ1cHRzIGFyZSBkaXNhYmxlZAp3aGVuIHdlIHJldHVybiBmcm9tIHZjNF9pcnFf dW5pbnN0YWxsLCB3ZSBuZWVkIHRvIGRpc2FibGUgaXQgYWdhaW4gaWYKY2FuY2VsX3dvcmtfc3lu YyBpbmRpY2F0ZWQgcGVuZGluZyB3b3JrLgoKU2lnbmVkLW9mZi1ieTogU3RlZmFuIFNjaGFrZSA8 c3RzY2hha2VAZ21haWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2lycS5jIHwg OSArKysrKysrKy0KIDEgZmlsZSBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24o LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9pcnEuYyBiL2RyaXZlcnMv Z3B1L2RybS92YzQvdmM0X2lycS5jCmluZGV4IDYxYjJlNTMuLjdkNzgwMTQ5ZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Zj NC92YzRfaXJxLmMKQEAgLTIzMSw3ICsyMzEsMTQgQEAKIAkvKiBGaW5pc2ggYW55IGludGVycnVw dCBoYW5kbGVyIHN0aWxsIGluIGZsaWdodC4gKi8KIAlkaXNhYmxlX2lycShkZXYtPmlycSk7CiAK LQljYW5jZWxfd29ya19zeW5jKCZ2YzQtPm92ZXJmbG93X21lbV93b3JrKTsKKwlpZiAoY2FuY2Vs X3dvcmtfc3luYygmdmM0LT5vdmVyZmxvd19tZW1fd29yaykpIHsKKwkJLyoKKwkJICogV29yayB3 YXMgc3RpbGwgcGVuZGluZy4gVGhlIG92ZXJmbG93IG1lbSB3b3JrJ3MKKwkJICogY2FsbGJhY2sg cmVlbmFibGVzIHRoZSBPVVRPTUVNIGludGVycnVwdCB1cG9uCisJCSAqIGNvbXBsZXRpb24sIHNv IGVuc3VyZSBpdCBpcyBkaXNhYmxlZCBoZXJlLgorCQkgKi8KKwkJVjNEX1dSSVRFKFYzRF9JTlRE SVMsIFYzRF9JTlRfT1VUT01FTSk7CisJfQogfQogCiAvKiogUmVpbml0aWFsaXplcyBpbnRlcnJ1 cHQgcmVnaXN0ZXJzIHdoZW4gYSBHUFUgcmVzZXQgaXMgcGVyZm9ybWVkLiAqLwotLSAKMS45LjEK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZl bCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755529AbdKJBFz (ORCPT ); Thu, 9 Nov 2017 20:05:55 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:56499 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755508AbdKJBFv (ORCPT ); Thu, 9 Nov 2017 20:05:51 -0500 X-Google-Smtp-Source: ABhQp+TjHoHgww6MuMKn0QGcDtInULtT7BF0pvTcAmQpqKyle1wBKnibdo6Mq9KMKnjDYrVbQljT8A== From: Stefan Schake To: dri-devel@lists.freedesktop.org Cc: linux-rpi-kernel@lists.infradead.org, Stefan Schake , Eric Anholt , David Airlie , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] drm/vc4: Ensure interrupts are disabled Date: Fri, 10 Nov 2017 02:05:07 +0100 Message-Id: <1510275907-993-3-git-send-email-stschake@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1510275907-993-1-git-send-email-stschake@gmail.com> References: <1510275907-993-1-git-send-email-stschake@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The overflow mem work callback vc4_overflow_mem_work reenables its associated interrupt upon completion. To ensure all interrupts are disabled when we return from vc4_irq_uninstall, we need to disable it again if cancel_work_sync indicated pending work. Signed-off-by: Stefan Schake --- drivers/gpu/drm/vc4/vc4_irq.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_irq.c b/drivers/gpu/drm/vc4/vc4_irq.c index 61b2e53..7d780149d 100644 --- a/drivers/gpu/drm/vc4/vc4_irq.c +++ b/drivers/gpu/drm/vc4/vc4_irq.c @@ -231,7 +231,14 @@ /* Finish any interrupt handler still in flight. */ disable_irq(dev->irq); - cancel_work_sync(&vc4->overflow_mem_work); + if (cancel_work_sync(&vc4->overflow_mem_work)) { + /* + * Work was still pending. The overflow mem work's + * callback reenables the OUTOMEM interrupt upon + * completion, so ensure it is disabled here. + */ + V3D_WRITE(V3D_INTDIS, V3D_INT_OUTOMEM); + } } /** Reinitializes interrupt registers when a GPU reset is performed. */ -- 1.9.1