From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751410AbdL2QGW (ORCPT ); Fri, 29 Dec 2017 11:06:22 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34998 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750869AbdL2QGU (ORCPT ); Fri, 29 Dec 2017 11:06:20 -0500 X-Google-Smtp-Source: ACJfBotalLN98n3NGoTUH7OsYUglVERqd7vURSa1NVN6EG7XB6ctSNk5zwUGxd6Cjp89SifwRwFwtg== From: Stefan Schake To: Eric Anholt , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: linux-rpi-kernel@lists.infradead.org, Stefan Schake Subject: [PATCH] drm/vc4: Move IRQ enable to PM path Date: Fri, 29 Dec 2017 17:05:43 +0100 Message-Id: <1514563543-32511-1-git-send-email-stschake@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We were calling enable_irq on bind, where it was already enabled previously by the IRQ helper. Additionally, dev->irq is not set correctly until after postinstall and so was always zero here, triggering a warning in 4.15. Fix both by moving the enable to the power management resume path, where we know there was a previous disable invocation during suspend. Fixes: 253696ccd613 ("drm/vc4: Account for interrupts in flight") Signed-off-by: Stefan Schake --- I tested replacing the enable/disable dance with just synchronize_irq, but that only made the original kernel OOPS more sporadic. drivers/gpu/drm/vc4/vc4_irq.c | 3 --- drivers/gpu/drm/vc4/vc4_v3d.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_irq.c b/drivers/gpu/drm/vc4/vc4_irq.c index 26eddbb..3dd62d7 100644 --- a/drivers/gpu/drm/vc4/vc4_irq.c +++ b/drivers/gpu/drm/vc4/vc4_irq.c @@ -209,9 +209,6 @@ { struct vc4_dev *vc4 = to_vc4_dev(dev); - /* Undo the effects of a previous vc4_irq_uninstall. */ - enable_irq(dev->irq); - /* Enable both the render done and out of memory interrupts. */ V3D_WRITE(V3D_INTENA, V3D_DRIVER_IRQS); diff --git a/drivers/gpu/drm/vc4/vc4_v3d.c b/drivers/gpu/drm/vc4/vc4_v3d.c index 622cd43..493f392b 100644 --- a/drivers/gpu/drm/vc4/vc4_v3d.c +++ b/drivers/gpu/drm/vc4/vc4_v3d.c @@ -327,6 +327,9 @@ static int vc4_v3d_runtime_resume(struct device *dev) return ret; vc4_v3d_init_hw(vc4->dev); + + /* We disabled the IRQ as part of vc4_irq_uninstall in suspend. */ + enable_irq(vc4->dev->irq); vc4_irq_postinstall(vc4->dev); return 0; -- 1.9.1