From patchwork Thu Jul 9 21:32:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6759841 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 E7F60C05AC for ; Thu, 9 Jul 2015 21:30:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 290BB20792 for ; Thu, 9 Jul 2015 21:30:23 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3C21E2078F for ; Thu, 9 Jul 2015 21:30:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 388907A014; Thu, 9 Jul 2015 14:30:21 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) by gabe.freedesktop.org (Postfix) with ESMTPS id 19F3F7A017 for ; Thu, 9 Jul 2015 14:30:20 -0700 (PDT) Received: by wgck11 with SMTP id k11so234287040wgc.0 for ; Thu, 09 Jul 2015 14:30:18 -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=42hIMq3q+HTH3DcUhGE0flKA756Zr7QaeQhGsOLB8zg=; b=S19JYy7U3FeJEJ9+jsmzUybL/nkZdcdnuHeO5WdkyaZ9nE1LkjYOrk+u64362c7xlI h0nEV+CyvN4G6SNSwESoKgYUSIs2NwLbA0K4CdMXA5ojp3j1M+2ef3yz4lNkV4uVBo60 OtJAAKa8DXsz7zP0zfs8pSrG9iOtT4kCWIQfE= 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=42hIMq3q+HTH3DcUhGE0flKA756Zr7QaeQhGsOLB8zg=; b=FEyzApPc57fhc8CZ0wZIoZz6NxJhF2jG5Pd6lQuFazMssVf9fkmKGKsNrSUHsVnrqX 2cZxzNfXNjMqddMCJZKZtsLTD0Yx+wWrMPTiLw6WteUts97suZ5As8/+A5svQzT8+VbJ Wvzoq8n42P/dpYt8Dw26lP7vtjXZ8hZZVpLL0Q/vzo7Hha0lQ0pqorKoG4eVCBEHsPGH 0f5YdaIBHM5dy+za51IaZt6OodFZ/JcpbcJ48R+VYMCbBfUs5AP2ipbh6K0MXK7wQKD0 ZD4gPuMiN7/yjoXmwGJhs7POfrQsyC6cBggMSt31k8VJnfYz8UR7xk9LV/kbVC262X38 AO2A== X-Gm-Message-State: ALoCoQmAgI/WOy2bGrV9rmFC5hrPWNVWoiZsmTHfO2E2EOZh5QKQMBlaqeCKx8JvGrNulF+B/USP X-Received: by 10.180.104.129 with SMTP id ge1mr89842095wib.84.1436477418053; Thu, 09 Jul 2015 14:30:18 -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.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jul 2015 14:30:16 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 04/18] drm/ast: Don't grab dev->struct_mutex for in mmap offset ioctl Date: Thu, 9 Jul 2015 23:32:36 +0200 Message-Id: <1436477570-4936-5-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/ast/ast_main.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c index 035dacc93382..838217f8ce7d 100644 --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c @@ -571,24 +571,18 @@ ast_dumb_mmap_offset(struct drm_file *file, uint64_t *offset) { struct drm_gem_object *obj; - int ret; struct ast_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_ast_bo(obj); *offset = ast_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; }