From patchwork Thu Jul 9 21:32:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6759871 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 676AC9F319 for ; Thu, 9 Jul 2015 21:30:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9080120790 for ; Thu, 9 Jul 2015 21:30:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B17022078F for ; Thu, 9 Jul 2015 21:30:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F3E437A083; Thu, 9 Jul 2015 14:30:23 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTPS id B826D7A081 for ; Thu, 9 Jul 2015 14:30:22 -0700 (PDT) Received: by wifm2 with SMTP id m2so30112978wif.1 for ; Thu, 09 Jul 2015 14:30:21 -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=V0CYCMduuJPNALBoS1PZhzLqk9EIooXZJXjUy8hgYSY=; b=ZMjX73IieDPERy7ERKKfRCEFyhd+00o1AQFPW6j5fzA2IKpHGwQbbdKNQWrlm5oEs/ P6om1I3sx0qiqrNMhXweKX1dSr3lB1X7NmXrQ+Fes0JNyuZALuJU9Cyj0ZMt7eawNOjy C29XgRfmupWj3t41qbpR113QVk4HvYDJyE3Ss= 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=V0CYCMduuJPNALBoS1PZhzLqk9EIooXZJXjUy8hgYSY=; b=KQIGpk0ti3dzIf4IMeTS3mz0pVotZj35e5EIWkVYpxCvEygXHSGfj8SGGcskQF8LV9 A/YFdYNeEX+rrPjqEUDfkC8chwTApEVh1YJvSYBz7YzamVWReivI5TuXMbep/N0YM4R/ 2q25j6xB3qhObJjYYZo6jwVbWGpol1R1o8sGzqpDSAV/hm+eAnWmHNnf3RTEt/tBy3Wt NoFEA/lIxHZXsQQbNL52racbokdPdzkhzsLJmHtRJsWY5I1m5ZqCyEoFwQnTXGjBXwSZ pvq4/Sqzu2OU2zg5NFReSgDTHdhpHHRYxt9kQoEPverHdy1p9mGRZ8CGhxKMlDyHA8Fu wRVA== X-Gm-Message-State: ALoCoQkgD1CMxX4HyjqunsdbTVq6+2oDn3qSGgAvLJxUDD1qB+UBYF+RlQw6UMHYTL9IIuXWj0GI X-Received: by 10.180.86.73 with SMTP id n9mr123882635wiz.78.1436477421385; Thu, 09 Jul 2015 14:30:21 -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.20 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jul 2015 14:30:20 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 06/18] drm/mga200g: Don't grab dev->struct_mutex for in mmap offset ioctl Date: Thu, 9 Jul 2015 23:32:38 +0200 Message-Id: <1436477570-4936-7-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/mgag200/mgag200_main.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/mgag200/mgag200_main.c b/drivers/gpu/drm/mgag200/mgag200_main.c index f6b283b8375e..c99c2cb28939 100644 --- a/drivers/gpu/drm/mgag200/mgag200_main.c +++ b/drivers/gpu/drm/mgag200/mgag200_main.c @@ -345,23 +345,15 @@ mgag200_dumb_mmap_offset(struct drm_file *file, uint64_t *offset) { struct drm_gem_object *obj; - int ret; struct mgag200_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_mga_bo(obj); *offset = mgag200_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; }