From patchwork Mon Nov 23 09:32:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7678621 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 44B569F1D3 for ; Mon, 23 Nov 2015 09:33:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7190520621 for ; Mon, 23 Nov 2015 09:33:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 62DA720630 for ; Mon, 23 Nov 2015 09:33:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CF04A720C6; Mon, 23 Nov 2015 01:33:21 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by gabe.freedesktop.org (Postfix) with ESMTPS id 55DA3720CF for ; Mon, 23 Nov 2015 01:33:20 -0800 (PST) Received: by wmec201 with SMTP id c201so151027893wme.0 for ; Mon, 23 Nov 2015 01:33:19 -0800 (PST) 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=QoiyrLdRSPcTxebJhvu2DUD5DYWShxZPEAkOPOhXHQ4=; b=kHgUnMMkvNlEISBQbP/rBXGmWm78B4/f0a8BUnuYGTsB+uswRa/qD+8NklM+EIdodr jw3Wh4ws5htxRwc0+XHd8EJz0neqUpRiPAw6bW8lzc9enRnnXG7SC7tKHzHmDxqY2sX2 FWGjzUkhu7ZU3rlxq2LbIXKlmjjWwQj8UySaA= 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=QoiyrLdRSPcTxebJhvu2DUD5DYWShxZPEAkOPOhXHQ4=; b=P3TSU6oHTPsoG7X0hoTKGuPuIFad8xkIslzHFaAEiFnvlLql6hvsjFa+VHQB4h+9sh c5M7Fcv4lVnkiNgmOeo/crRMfGFoxVifCKSAZPDED116sru+dn6aWCKruXK5gfLN07Ru awdFr07ChtlCRJ/bwHPYN+ILwHcOi46ZHAS19vzCa0tODy1w1oLjTHKf9g+XiA+8tCE4 SPU3ehlup6DSTQwgfC6ksy0bnoxBOMJd+d3N1uOAuksCwdX3/sguJH2CKcfgb1GvGWVg pfcfVH530xPPxGEzg0+M6ivWVlksiXMJicfTs1FYSn/jJhLTQGGiXoksaa3MwjX5wd15 97OA== X-Gm-Message-State: ALoCoQk/BHWZrvGZ5IwItgbTLsVM8cC6bzGI+R6qUHZPs9vEpmF6yxyclM1s02RRMJZH5a0LjdUk X-Received: by 10.194.171.97 with SMTP id at1mr29450512wjc.39.1448271199102; Mon, 23 Nov 2015 01:33:19 -0800 (PST) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id pn6sm12332758wjb.15.2015.11.23.01.33.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Nov 2015 01:33:18 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 06/29] drm/qxl: Use unlocked gem unreferencing Date: Mon, 23 Nov 2015 10:32:39 +0100 Message-Id: <1448271183-20523-7-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1448271183-20523-1-git-send-email-daniel.vetter@ffwll.ch> References: <1448271183-20523-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter , Intel Graphics Development , Dave Airlie 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_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 For drm_gem_object_unreference callers are required to hold dev->struct_mutex, which these paths don't. Enforcing this requirement has become a bit more strict with commit ef4c6270bf2867e2f8032e9614d1a8cfc6c71663 Author: Daniel Vetter Date: Thu Oct 15 09:36:25 2015 +0200 drm/gem: Check locking in drm_gem_object_unreference Cc: Dave Airlie Signed-off-by: Daniel Vetter --- drivers/gpu/drm/qxl/qxl_fb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c index 7136e521e6db..bb7ce07b788b 100644 --- a/drivers/gpu/drm/qxl/qxl_fb.c +++ b/drivers/gpu/drm/qxl/qxl_fb.c @@ -443,11 +443,11 @@ out_unref: } } if (fb && ret) { - drm_gem_object_unreference(gobj); + drm_gem_object_unreference_unlocked(gobj); drm_framebuffer_cleanup(fb); kfree(fb); } - drm_gem_object_unreference(gobj); + drm_gem_object_unreference_unlocked(gobj); return ret; }