From patchwork Thu Jul 9 21:32:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6759901 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 C720BC05AC for ; Thu, 9 Jul 2015 21:30:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ECCF520792 for ; Thu, 9 Jul 2015 21:30:28 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 1EE1D20790 for ; Thu, 9 Jul 2015 21:30:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6F3547A085; Thu, 9 Jul 2015 14:30:27 -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 47A3B7A08A for ; Thu, 9 Jul 2015 14:30:26 -0700 (PDT) Received: by wiga1 with SMTP id a1so323698561wig.0 for ; Thu, 09 Jul 2015 14:30:25 -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=qSD6LijeAg4zfeoGh+bWMATFzwSPhuFaDkAMHy5pbVQ=; b=flP4rz46d0cCTgajZvrx+zy86GmiMk+5+tWXS/RV0i3LEEC2Fsj835ojzdeqRGne0a KD4dRr8Oq1Gy97knU4cCzd0S2xz4hbcscPrXHrvpNw+p0lwq2+PWxwW9PG+CaPME1vUH Cpca3O9se16dfFI2Cd4XhzN1fx4yrdvkD+hkc= 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=qSD6LijeAg4zfeoGh+bWMATFzwSPhuFaDkAMHy5pbVQ=; b=izruIPHH6J9eMQyHbWOboXvi40fkKVxdMBc4B/B/OJTN0858moS7rjCeyJJ9fMYe48 4zozlirtKj1/DwhOHvDGbSfmF8t3V8aWxWnhtIL60VZw3rKgs4YbMQRjb5ra/5NPgVBk ynQ7ym7x75FqZtBsX6GukDUtu9r51Q90sXjOMLsmNzhzT2pjBzIDVDJ74xv6kOQ/tyG9 miKAHwNMmMeH7UJqbfMNVNJXfOxJtXTMl4xBQI5XOycWisQpkxa50+EaxCq9t6fRk63b T7hPX/SRzl4kbQGCZn2gu2/yz0QKv1skmfcrrZ33CTifxI6VcK0DvRSnZRyNE4LiJoli Jnrg== X-Gm-Message-State: ALoCoQn29Acn6b/wREVOV52hgR7IzyZodgR4J1gvZdeIrtn3PTglO551OWDMmCJ00E70XgMH7+4M X-Received: by 10.194.87.4 with SMTP id t4mr36914609wjz.84.1436477425038; Thu, 09 Jul 2015 14:30:25 -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.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jul 2015 14:30:24 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 08/18] drm/cirrus: Don't grab dev->struct_mutex for in mmap offset ioctl Date: Thu, 9 Jul 2015 23:32:40 +0200 Message-Id: <1436477570-4936-9-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 Since David Herrmann's mmap vma manager rework we don't need to grab dev->struct_mutex any more to prevent races when looking up the mmap offset. Drop it and instead don't forget to use the unref_unlocked variant (since the drm core still cares). Signed-off-by: Daniel Vetter Reviewed-by: Thierry Reding --- drivers/gpu/drm/cirrus/cirrus_main.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/cirrus/cirrus_main.c b/drivers/gpu/drm/cirrus/cirrus_main.c index e4b976658087..055fd86ba717 100644 --- a/drivers/gpu/drm/cirrus/cirrus_main.c +++ b/drivers/gpu/drm/cirrus/cirrus_main.c @@ -293,25 +293,18 @@ cirrus_dumb_mmap_offset(struct drm_file *file, uint64_t *offset) { struct drm_gem_object *obj; - int ret; struct cirrus_bo *bo; - mutex_lock(&dev->struct_mutex); obj = drm_gem_object_lookup(dev, file, handle); - if (obj == NULL) { - ret = -ENOENT; - goto out_unlock; - } + if (obj == NULL) + return -ENOENT; bo = gem_to_cirrus_bo(obj); *offset = cirrus_bo_mmap_offset(bo); - drm_gem_object_unreference(obj); - ret = 0; -out_unlock: - mutex_unlock(&dev->struct_mutex); - return ret; + drm_gem_object_unreference_unlocked(obj); + return 0; } bool cirrus_check_framebuffer(struct cirrus_device *cdev, int width, int height,