From patchwork Wed Mar 30 09:40:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 8694401 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 DEA09C0553 for ; Wed, 30 Mar 2016 09:41:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EDE7A20380 for ; Wed, 30 Mar 2016 09:41:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id ED23E2037C for ; Wed, 30 Mar 2016 09:41:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 598C26E744; Wed, 30 Mar 2016 09:41:12 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x236.google.com (mail-wm0-x236.google.com [IPv6:2a00:1450:400c:c09::236]) by gabe.freedesktop.org (Postfix) with ESMTPS id 38EE26E739 for ; Wed, 30 Mar 2016 09:41:06 +0000 (UTC) Received: by mail-wm0-x236.google.com with SMTP id p65so63008041wmp.0 for ; Wed, 30 Mar 2016 02:41:06 -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=H+6uqlvyw5jcg8vUtLR79JeAqVSs/Bh6uVt2BFZVvpM=; b=GrMciKenNwrbAWyGDxlgzmS6bPv6S6cS6g6gSaSyjkDndLmT9FgeUHV2NAX0rL9TSu wBKGiXPJdX6tuKYd4vpTF1buYYFfmex9d3AOWuK+LaxDPnMf3+jdCyxj//zklkBJXpGs m/742woUwDqzUXUUqlmMd+JwkUj1RgblxNHqM= 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=H+6uqlvyw5jcg8vUtLR79JeAqVSs/Bh6uVt2BFZVvpM=; b=N5f2xYnwmpkZC46/Tsy02Ozguxx9LVMictCJmLZNkS8/7Jp4M8EUrXLslOsnRaeuHO VkNakJJqN2CHHiKzWxcqPcS8+BfM51La7GcDbNtxW2fmlxupu2SW9XvZmFHJ1oIugWbx fo21uDX9cn8zy6h2phTmeennUBvr6DuqQrURY3vZy+oJ/Gj1kt2AZnwXInctjyS2ivWV 0ImJF3MSYtDb6DqURfajrDjgUDkBQfJyIq9BD14d3sLdVP9gLQDlSkb7Q/BmXMHoWKDC JQgCBM/h9eB8FX37/xYdQWInPUEs7JX1UM2k5pkaBIayp6+0AMll3UnJDHzkPlKuUg2f cC8Q== X-Gm-Message-State: AD7BkJJtqhaYZFbnIhxP2RcI8J9/4MQrLCijfO+NTi+zTWzZ42fiq9qHuoUVMNQKa4plTA== X-Received: by 10.194.242.202 with SMTP id ws10mr8255725wjc.3.1459330863453; Wed, 30 Mar 2016 02:41:03 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id v2sm3476437wmd.24.2016.03.30.02.41.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 02:41:02 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 10/13] drm/vgem: Simplify dum_map Date: Wed, 30 Mar 2016 11:40:49 +0200 Message-Id: <1459330852-27668-11-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1459330852-27668-1-git-send-email-daniel.vetter@ffwll.ch> References: <1459330852-27668-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , 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=-5.1 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 The offset manager already checks for existing offsets internally, while holding suitable locks. We can drop this check. Signed-off-by: Daniel Vetter Reviewed-by: Emil Velikov --- drivers/gpu/drm/vgem/vgem_drv.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c index c503a840fd88..f3ee1c41da1e 100644 --- a/drivers/gpu/drm/vgem/vgem_drv.c +++ b/drivers/gpu/drm/vgem/vgem_drv.c @@ -208,11 +208,9 @@ int vgem_gem_dumb_map(struct drm_file *file, struct drm_device *dev, goto unlock; } - if (!drm_vma_node_has_offset(&obj->vma_node)) { - ret = drm_gem_create_mmap_offset(obj); - if (ret) - goto unref; - } + ret = drm_gem_create_mmap_offset(obj); + if (ret) + goto unref; BUG_ON(!obj->filp);