From patchwork Mon Nov 23 09:32:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7678871 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 E03859F1D3 for ; Mon, 23 Nov 2015 09:33:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C91832065E for ; Mon, 23 Nov 2015 09:33:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 084A920621 for ; Mon, 23 Nov 2015 09:33:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5AA0B72100; Mon, 23 Nov 2015 01:33:35 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by gabe.freedesktop.org (Postfix) with ESMTPS id 11127720F9 for ; Mon, 23 Nov 2015 01:33:33 -0800 (PST) Received: by wmec201 with SMTP id c201so96431598wme.1 for ; Mon, 23 Nov 2015 01:33:31 -0800 (PST) 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=yLcSBLfML9M1JwbIDBYbrYEZMk3cGjBA03qmyNwavh8=; b=aEeEz+Mepcs2rlhHPqLApbcSc/67dEqIDI0WBMmH7kC8qDA5p/nEmgXI5hxw7YtiEM KeMPdOwv9uXIy17d2WKha5Ws51YRP3gKo+E8kvZvmNMS1B4V7w8oLVR/wdVWeEzM1XGi 1o/zh0pO3lddtjZrUIkdPn81WIuHesdoxI9k8= 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=yLcSBLfML9M1JwbIDBYbrYEZMk3cGjBA03qmyNwavh8=; b=EDbyKn4w7fpbg3jBwGnFnoKK3cDR0huV7czLYXU5yYRHnyF/Fiyqgyy28l2J+/MVtO QupM+4gY9ijMmAIdwvkW7vfmBKzfOdzb3QCT9EeIyUsqpHEkX4fgnswc1iY/oaLNs4w/ pVcn5ALQDKKy/l2pi1bupV2rYLOmNEiHWXg1OKdsiKsB4opGT6Ou92uXVrMtDIOeCE/z rFuq3Lhk23vUz+tQnU+Rptj1CfERqXSvXmuKzDYIbGIdU0tsJkbXwfqNitfdKsNKSJgx 5ClCAPQya3VOmW5ZQ0RKrTMEEbbcpvNvEUKju+5+ynX445gEJDI/Cvz9m7PT5FL7XwPv jbvg== X-Gm-Message-State: ALoCoQnZcCqedtJ1Niwynn8hpPgwghhQNq8TXwkYyq/IU1gsGMcVW4iSy9MkmP320d9k853YrAaG X-Received: by 10.28.129.82 with SMTP id c79mr18562401wmd.80.1448271211835; Mon, 23 Nov 2015 01:33:31 -0800 (PST) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id pn6sm12332758wjb.15.2015.11.23.01.33.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Nov 2015 01:33:31 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 19/29] drm/gma500: Drop dev->struct_mutex from mmap offset function Date: Mon, 23 Nov 2015 10:32:52 +0100 Message-Id: <1448271183-20523-20-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1448271183-20523-1-git-send-email-daniel.vetter@ffwll.ch> References: <1448271183-20523-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.7 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 Simply forgotten about this when I was doing my general cleansing of simple gem mmap offset functions. There's nothing but core functions called here, and they all have their own protection already. Cc: Patrik Jakobsson Acked-by: Patrik Jakobsson Signed-off-by: Daniel Vetter --- drivers/gpu/drm/gma500/gem.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c index e3bdc8b1c32c..f0357f525f56 100644 --- a/drivers/gpu/drm/gma500/gem.c +++ b/drivers/gpu/drm/gma500/gem.c @@ -62,15 +62,10 @@ int psb_gem_dumb_map_gtt(struct drm_file *file, struct drm_device *dev, int ret = 0; struct drm_gem_object *obj; - mutex_lock(&dev->struct_mutex); - /* GEM does all our handle to object mapping */ obj = drm_gem_object_lookup(dev, file, handle); - if (obj == NULL) { - ret = -ENOENT; - goto unlock; - } - /* What validation is needed here ? */ + if (obj == NULL) + return -ENOENT; /* Make it mmapable */ ret = drm_gem_create_mmap_offset(obj); @@ -78,9 +73,7 @@ int psb_gem_dumb_map_gtt(struct drm_file *file, struct drm_device *dev, goto out; *offset = drm_vma_node_offset_addr(&obj->vma_node); out: - drm_gem_object_unreference(obj); -unlock: - mutex_unlock(&dev->struct_mutex); + drm_gem_object_unreference_unlocked(obj); return ret; }