From patchwork Thu Nov 19 16:46:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7659121 Return-Path: X-Original-To: patchwork-intel-gfx@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 39A729FD24 for ; Thu, 19 Nov 2015 16:47:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 51F2620676 for ; Thu, 19 Nov 2015 16:47:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A9FA92067A for ; Thu, 19 Nov 2015 16:47:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 73514720DE; Thu, 19 Nov 2015 08:47:15 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by gabe.freedesktop.org (Postfix) with ESMTPS id A336D7A16B for ; Thu, 19 Nov 2015 08:47:09 -0800 (PST) Received: by wmww144 with SMTP id w144so246351566wmw.1 for ; Thu, 19 Nov 2015 08:47:08 -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=arHJrh1LGwDMXAyCgTX/JF3BhzcZj0wxrbcy9BYXqtxYqniCn6v7hmnC48EU+3NnGi b6WTuIQgHr9kNC+oO+ObJL7cXTMDaMkVv9yN4BfGKczaz4+xfJWmxBBSqGzphkCmVCQv Bie2n8M+NiUn10iit29epw4Gq3k9WKnbOr4cw= 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=lXUTIWzw4j9euEJuChWbnnkmMhRR1wP1YCUz5txEMRve7GobZiQZ2Ly3em9+93xi7y Q6C5NRse5o9vgDMQSkJp1zHw8nLnOmv5oJz/HOd4TfBbbnPtxQpuZVh8Gg3d1K2HK3Kk Np0Nz/oPmbBK8BrvFbqyLJDb+P/ACITzqBl5nRPRbiHDsXa+gvPQBvzB4ARoggemsosX Kb6KZcg2kaITgnHhnIs0ArXzHZKfUcZoIOIEflMHNJVfcGoR5Ng3HHYpyIQ6cdQFwvS/ 0e2CdzU9DEINW4oyhEN6EmYAko+IK/0N2QFP4ygX4SzbCAsvwyCi7700Mqp8tqn2LvPW t1Cg== X-Gm-Message-State: ALoCoQkCwRAWcbhG4NzLf68oVR1eox4vRfruS3lqbFRWG8Ff032neU9UMVtyrYjxYj2xekozXTHl X-Received: by 10.194.92.229 with SMTP id cp5mr9432868wjb.163.1447951628438; Thu, 19 Nov 2015 08:47:08 -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 cv3sm8695001wjc.20.2015.11.19.08.47.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Nov 2015 08:47:07 -0800 (PST) From: Daniel Vetter To: DRI Development Date: Thu, 19 Nov 2015 17:46:39 +0100 Message-Id: <1447951610-12622-11-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1447951610-12622-1-git-send-email-daniel.vetter@ffwll.ch> References: <1447951610-12622-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Subject: [Intel-gfx] [PATCH RESEND 10/20] drm/gma500: Drop dev->struct_mutex from mmap offset function X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.6 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; }