From patchwork Sat Nov 8 15:16:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 5257111 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B4A149F2F1 for ; Sat, 8 Nov 2014 15:16:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F315920138 for ; Sat, 8 Nov 2014 15:16:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id DCB492012B for ; Sat, 8 Nov 2014 15:16:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 503796E390; Sat, 8 Nov 2014 07:16:32 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qg0-f54.google.com (mail-qg0-f54.google.com [209.85.192.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D2116E390 for ; Sat, 8 Nov 2014 07:16:31 -0800 (PST) Received: by mail-qg0-f54.google.com with SMTP id q108so3787019qgd.27 for ; Sat, 08 Nov 2014 07:16:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=3GHENQpHkC90GH/fV8uMRa2yv/g/AHxWpfxYMUDYmSQ=; b=Ju5MwczBvj3NxNdBgKO3R+KtXxNWTAflUgNMlH4v6a9QgijPBSczQfHYDBrZs/uT+V xQrmcgnA9N887XFibWioJW3O9Ky/gYVTBM5G0XBNrRAHTkp5kd0suaQWDc+d2rKj8cln fWE1+kqim9Dsr4ssj6l/brmLRt98bHoyuzPrcyL2SmimdOBmEgFHwEHaA8IJhrKLe1NC 9P0AHUIYImuDOO0O6fe+k4qPVhy3av+3r5DsU9nx3iNaPkFe5mCNk5pVXNbX/nEHlndT cYPoRjs3PeYtQitQJ3fnlCo1FdiwJWFc7bTAhYpF37XS+6sYzLAd+bZUOZzGvF7HeSzh azBQ== X-Received: by 10.229.49.69 with SMTP id u5mr2565046qcf.19.1415459790457; Sat, 08 Nov 2014 07:16:30 -0800 (PST) Received: from localhost ([2601:6:2c00:943:2677:3ff:fed3:ff40]) by mx.google.com with ESMTPSA id b60sm10971290qge.22.2014.11.08.07.16.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Nov 2014 07:16:29 -0800 (PST) From: Rob Clark To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/irq: BUG_ON() -> WARN_ON() Date: Sat, 8 Nov 2014 10:16:19 -0500 Message-Id: <1415459779-30961-1-git-send-email-robdclark@gmail.com> X-Mailer: git-send-email 1.9.3 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Let's make things a bit easier to debug when things go bad (potentially under console_lock). Signed-off-by: Rob Clark Reviewed-by: Michel Dänzer --- drivers/gpu/drm/drm_irq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 5ef03c2..c4edea9 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -1029,7 +1029,8 @@ void drm_vblank_put(struct drm_device *dev, int crtc) { struct drm_vblank_crtc *vblank = &dev->vblank[crtc]; - BUG_ON(atomic_read(&vblank->refcount) == 0); + if (WARN_ON(atomic_read(&vblank->refcount) == 0)) + return; if (WARN_ON(crtc >= dev->num_crtcs)) return;