From patchwork Thu Jul 9 21:32:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6759941 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 790C6C05AC for ; Thu, 9 Jul 2015 21:30:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9DB6C2078F for ; Thu, 9 Jul 2015 21:30:30 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id CFF1C20790 for ; Thu, 9 Jul 2015 21:30:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E1D4D7A08B; Thu, 9 Jul 2015 14:30:28 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by gabe.freedesktop.org (Postfix) with ESMTPS id EB0117A08E for ; Thu, 9 Jul 2015 14:30:27 -0700 (PDT) Received: by wiclp1 with SMTP id lp1so119347536wic.0 for ; Thu, 09 Jul 2015 14:30:26 -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=JqVYP7ehueLIYPN3evJVa9L5QQh8y+7EAN1fiBexZ8E=; b=YEEcBKGMb9TKXLlYT8GYKvjSTlLzDZWCRN/0v295N31cfFVGKzssH4rclVg9TOSNhg +wXXWuA7zV2PoZCwFtlxuBXI3DbuBxIhxPMIrwuCp51D3huAUVKdGCD42nbxnLx/G7L1 ghGR+oL8Q4rTiF7g1dlv/Uw29MakvOxgo6Mis= 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=JqVYP7ehueLIYPN3evJVa9L5QQh8y+7EAN1fiBexZ8E=; b=Eg1VROCWy89KvbSnq0TBmeU9YASMKnjIaPhiXFDRI67cqzWM5nO2m6knC86NA4vBzR LNxCSE+5pv0lduHO+WuPIlnlRZDo70qJWfSVpvJnfEjrHq8zTGjqEXWiMl4NnyfjVl0e W/r3fVLguNeaFKMaimAfPYneMSJBWyhrTD0m0V2YqkmSCd+i3b0oKnz21GIn+hpkT8aD R6cUuy95YbfxOWR/nZJmGv3eHD0HiofjJWxWg5AcxMBLOwLEAGNPNDRUD2rvKJLuKvku QcMSrOsQdVqdywwJHgmSLxcRMw9j2VMdIJf8FOu+4HT5EHqgz2AOfnkv8W0Z4eCvbOBL Umtg== X-Gm-Message-State: ALoCoQnct59hputJYtu0W2xcU6a/hsyGW2Tzjphhu32G1KpznL8dK8HODnK0ONKDw+HyURckBX6f X-Received: by 10.194.5.103 with SMTP id r7mr33650294wjr.47.1436477426720; Thu, 09 Jul 2015 14:30:26 -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.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jul 2015 14:30:26 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 09/18] drm/cma-helper: Don't grab dev->struct_mutex for in mmap offset ioctl Date: Thu, 9 Jul 2015 23:32:41 +0200 Message-Id: <1436477570-4936-10-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 , Laurent Pinchart , 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). Cc: Laurent Pinchart Cc: Rob Clark Signed-off-by: Daniel Vetter Reviewed-by: Thierry Reding --- drivers/gpu/drm/drm_gem_cma_helper.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c index ca2ed7e7b595..cd55e4e9a891 100644 --- a/drivers/gpu/drm/drm_gem_cma_helper.c +++ b/drivers/gpu/drm/drm_gem_cma_helper.c @@ -289,20 +289,15 @@ int drm_gem_cma_dumb_map_offset(struct drm_file *file_priv, { struct drm_gem_object *gem_obj; - mutex_lock(&drm->struct_mutex); - gem_obj = drm_gem_object_lookup(drm, file_priv, handle); if (!gem_obj) { dev_err(drm->dev, "failed to lookup GEM object\n"); - mutex_unlock(&drm->struct_mutex); return -EINVAL; } *offset = drm_vma_node_offset_addr(&gem_obj->vma_node); - drm_gem_object_unreference(gem_obj); - - mutex_unlock(&drm->struct_mutex); + drm_gem_object_unreference_unlocked(gem_obj); return 0; }