From patchwork Thu Jul 9 21:32:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6759811 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E6B63C05AC for ; Thu, 9 Jul 2015 21:30:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 14897207A5 for ; Thu, 9 Jul 2015 21:30:20 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 071EB2078F for ; Thu, 9 Jul 2015 21:30:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8AD377A012; Thu, 9 Jul 2015 14:30:17 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by gabe.freedesktop.org (Postfix) with ESMTPS id 665367A018 for ; Thu, 9 Jul 2015 14:30:16 -0700 (PDT) Received: by wiga1 with SMTP id a1so323695568wig.0 for ; Thu, 09 Jul 2015 14:30:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0AmiywZ3Nmgc56+U0xWXH2+t6T4d6N4Vn7rPxXOcM4M=; b=PpM0qaZAOuhbHzpFHy3yPNOq1lwu63jQNUXelO1xcjqGVTO2jMMorRVr3Aouyvt/kz uCafnlqZk4ybjdnC07tVelq2FdWFyYNiargnySaOdhql/l1k0wz/sTOY/WegeH3plLik c3VB7mKUzvmNQlSZsi7uSFrL16XT15Kj3hNBI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0AmiywZ3Nmgc56+U0xWXH2+t6T4d6N4Vn7rPxXOcM4M=; b=HAU+zR8+/D3bd3bPNeHITf+rjzp+r3jw4udVCpstAdOj497/ZSt0/GlPTMTYjYyid8 N1IDCV+EupgOTx53GUSGBeB0g5WmISPlHVO/WPiuGBX98uc+TnD2cISok+fj/6BK9bfd NW2BAuwz4oUyXNYE+Ht6apmxG84mZVtKOOPvWqt8LfG8pgW6iXhfSsL/A0xdJShLDgdV VVaJNkYOjsVVEM90mzWAejvFo/b7bW/AHi+HPs/E++xgq598BBQFRGsWTyXP7aM05YZm dx2yfls/eTFoEBj1TQHmIXF3+mfQ5/If99ecbVFg61BW0WweWuRuu9tYJL5gDSl6OTe3 rm4A== X-Gm-Message-State: ALoCoQkeyCLG2qKDSYD6Fk9wOA5c36BGYttWLDurBRQ3c/1ihHS/nLOr632mHhdTUOpobuuxh3L/ X-Received: by 10.194.100.42 with SMTP id ev10mr32387948wjb.50.1436477415269; Thu, 09 Jul 2015 14:30:15 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id j6sm3004128wix.5.2015.07.09.14.30.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jul 2015 14:30:14 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 03/18] drm/gem: Be more friendly with locking checks Date: Thu, 9 Jul 2015 23:32:35 +0200 Message-Id: <1436477570-4936-4-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436477570-4936-1-git-send-email-daniel.vetter@ffwll.ch> References: <1436477570-4936-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter 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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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 BUG_ON kills the driver, WARN_ON is much friendly. And usually nothing bad happens when the locking is lightly busted. Signed-off-by: Daniel Vetter Reviewed-by: Thierry Reding --- drivers/gpu/drm/drm_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 27a4228b4343..3c2d4abd71c5 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -766,7 +766,7 @@ drm_gem_object_free(struct kref *kref) struct drm_gem_object *obj = (struct drm_gem_object *) kref; struct drm_device *dev = obj->dev; - BUG_ON(!mutex_is_locked(&dev->struct_mutex)); + WARN_ON(!mutex_is_locked(&dev->struct_mutex)); if (dev->driver->gem_free_object != NULL) dev->driver->gem_free_object(obj);