From patchwork Thu Jul 9 21:32:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6760031 Return-Path: X-Original-To: patchwork-intel-gfx@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 BD5CFC05AC for ; Thu, 9 Jul 2015 21:30:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EC7E120792 for ; Thu, 9 Jul 2015 21:30:38 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2F0D420790 for ; Thu, 9 Jul 2015 21:30:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 88B637A095; Thu, 9 Jul 2015 14:30:37 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by gabe.freedesktop.org (Postfix) with ESMTPS id 587937A090 for ; Thu, 9 Jul 2015 14:30:34 -0700 (PDT) Received: by wiclp1 with SMTP id lp1so119349009wic.0 for ; Thu, 09 Jul 2015 14:30:33 -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=Wbu9fqHz1adYeHdqNhuEWLEtL4SDtUzJ9tkdvM8/NY0=; b=bX+F/3m3mBb7+pV8yW0TjiYNE+wCwd8DihDqBfSFrPTWkBb05U+kFCT4fYTd71xDiG rlKIbWSfi3cWC/Uo2F5hiU2uEwr4xOFJ9NmRjKciLN4+LmOxckEALlzIUNPk45SIQpor I+zNVP4zS5TnXzTkt85KTqTyqs3tezHUnHyOc= 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=Wbu9fqHz1adYeHdqNhuEWLEtL4SDtUzJ9tkdvM8/NY0=; b=PbqeggqAgXA+LR2kX+UYoXDmA9DgiygL1QWXNThwZySMCCtxCfYnxq5QkH7sHGN/DB DzGMMju1Ia6EdMHgNmSGfmFjoN9+E6FwMzC3HDJK6VJkWKm2+vnIKUVz3NebMVO0xVkp 51v+llL7XF0dtQmcb08Eq+tPnnS9DoKUg92aosv6jsd0DayRFgh5oTHyVlG6mazCrYqO KZJONCJHyLw9K3CLhDIT8V/3OTYAKWhtrGjLJebAYYE2ATEauOTx3j6XcEB+w929cX3X KQ0gCmclWs6jyvCm2S2YgDBhobWLPJSAkpfI3pHQ6lh2uP56q1xKWGy6GrT0RrDQo24Y ouxQ== X-Gm-Message-State: ALoCoQmN/SFIibCIvVw1PPqyTRhhwRQBk41dZueduSr2Nj5NpL1kGua+oZEGrjyC7CU9zwoqEelH X-Received: by 10.181.27.131 with SMTP id jg3mr121003255wid.89.1436477433202; Thu, 09 Jul 2015 14:30:33 -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.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jul 2015 14:30:32 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Thu, 9 Jul 2015 23:32:45 +0200 Message-Id: <1436477570-4936-14-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 , Ben Skeggs , Daniel Vetter Subject: [Intel-gfx] [PATCH 13/18] drm/nouveau: Don't take dev->struct_mutex in ttm_fini X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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 This is only called in driver load/unload paths, no need to grab any locks at all. Also, ttm takes care of itself anyway. Cc: Ben Skeggs Signed-off-by: Daniel Vetter Reviewed-by: Thierry Reding --- drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c index 18f449715788..1f8ec0e2156c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c @@ -424,10 +424,8 @@ nouveau_ttm_init(struct nouveau_drm *drm) void nouveau_ttm_fini(struct nouveau_drm *drm) { - mutex_lock(&drm->dev->struct_mutex); ttm_bo_clean_mm(&drm->ttm.bdev, TTM_PL_VRAM); ttm_bo_clean_mm(&drm->ttm.bdev, TTM_PL_TT); - mutex_unlock(&drm->dev->struct_mutex); ttm_bo_device_release(&drm->ttm.bdev);