From patchwork Mon Oct 7 01:54:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qiang Yu X-Patchwork-Id: 11176705 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5FD211709 for ; Mon, 7 Oct 2019 01:57:37 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 481DE2087E for ; Mon, 7 Oct 2019 01:57:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 481DE2087E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9D6E76E442; Mon, 7 Oct 2019 01:57:36 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id 628596E442; Mon, 7 Oct 2019 01:57:35 +0000 (UTC) Received: by mail-pf1-x442.google.com with SMTP id q10so7651886pfl.0; Sun, 06 Oct 2019 18:57:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vCMjdk46j83K+YmWMfdReFCcF9CxWhT3FfjxqzRuQNA=; b=SjIGuvb4zKPjsQEcV4/tuTRKCzjZ4zz0035crghX8NuIh6e7+Eklmx9NJhDUzM76ce wH+TloUITClqcv1BeCVKadMHTmMYnl+rqyEo+tVppc1oPCRWsFSQrt/OkC5feSCI25cu sfDssiImxBXgRvBi3e/fL64wrd9FXgzX2RZEESOydB4p0hjliCF76cRQwMMapx4kVZ+P GoHlGmOz0sQF7omTAvoY5cSQOfzpHzq+P/ULLcakuu9nF5Y1/LWSXYQhP4iv9NTf2lMD LANmLBlVErhQlswB86V28+1nTpDLv0LIXqfg+L2apUVhrT7OpGjjTINDCdwvsaVB1qYn ygqw== X-Gm-Message-State: APjAAAXHN8+RqR1zNh4lnzEvED6PD7a5qCplnG3UVKWGlkxw+Wm9T1jP 5YNMtfc2Zp0Epto+mQUF/r7OnzfB3I+4uA== X-Google-Smtp-Source: APXvYqxgu23VoTDeRUgG568EtYDFY2FRPQOUtmccq4iJ1OyyPdiWAd1tJ5NuXYXoW0PzTGs/WvgV2Q== X-Received: by 2002:a17:90a:356d:: with SMTP id q100mr30999369pjb.53.1570413454815; Sun, 06 Oct 2019 18:57:34 -0700 (PDT) Received: from yuq-Aspire-4738G.lan (ah.ptr230.ptrcloud.net. [153.122.161.8]) by smtp.gmail.com with ESMTPSA id b123sm18328536pgc.72.2019.10.06.18.57.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Oct 2019 18:57:34 -0700 (PDT) From: Qiang Yu To: dri-devel@lists.freedesktop.org Subject: [PATCH v3 2/6] drm/v3d: use drm_gem_objects_lookup_user Date: Mon, 7 Oct 2019 09:54:26 +0800 Message-Id: <20191007015430.20829-3-yuq825@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191007015430.20829-1-yuq825@gmail.com> References: <20191007015430.20829-1-yuq825@gmail.com> X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vCMjdk46j83K+YmWMfdReFCcF9CxWhT3FfjxqzRuQNA=; b=RKruRgP+/BuF/Lz3ewdss9BA0cEoUwuZcLJUlnyTzhlDF6KOJLYkiVL7klnudhpXHu bZR6FT7Mq4sLa6fNCYChqsV5QcFmTLgygChgblTjzarVu10r4EAMZmDUxerX2NC5W8sX S3UpKhL8yayzZRN1jH1JEDnrpgAdVoCKlcvUAENEP3aI8k7rknuY/OOIs6gintNQ+JjM JO+JlK1SWrGo7Tm44Hw9L0AJiB1sxhzXSB/hzfdejONOdOOXAkWgCTyarR1nVZZaj8TG +85jI+cEUmn1j6Alu0Jpux30rAieKEG+JI6uXocuBcRFIYFjLUNPR/C4pMqa/q8L144X ioAQ== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lima@lists.freedesktop.org, David Airlie , Maxime Ripard , Qiang Yu , Sean Paul MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Simplify the GEM object lookup code with DRM GEM helper function drm_gem_objects_lookup_user(). v2: use drm_gem_objects_lookup_user instead of drm_gem_objects_lookup. v3: improve commit comemnt. Cc: Eric Anholt Reviewed-by: Steven Price Signed-off-by: Qiang Yu --- drivers/gpu/drm/v3d/v3d_gem.c | 49 +++-------------------------------- 1 file changed, 3 insertions(+), 46 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c index 4c4b59ae2c81..75a3b448f3fa 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -290,10 +290,6 @@ v3d_lookup_bos(struct drm_device *dev, u64 bo_handles, u32 bo_count) { - u32 *handles; - int ret = 0; - int i; - job->bo_count = bo_count; if (!job->bo_count) { @@ -304,48 +300,9 @@ v3d_lookup_bos(struct drm_device *dev, return -EINVAL; } - job->bo = kvmalloc_array(job->bo_count, - sizeof(struct drm_gem_cma_object *), - GFP_KERNEL | __GFP_ZERO); - if (!job->bo) { - DRM_DEBUG("Failed to allocate validated BO pointers\n"); - return -ENOMEM; - } - - handles = kvmalloc_array(job->bo_count, sizeof(u32), GFP_KERNEL); - if (!handles) { - ret = -ENOMEM; - DRM_DEBUG("Failed to allocate incoming GEM handles\n"); - goto fail; - } - - if (copy_from_user(handles, - (void __user *)(uintptr_t)bo_handles, - job->bo_count * sizeof(u32))) { - ret = -EFAULT; - DRM_DEBUG("Failed to copy in GEM handles\n"); - goto fail; - } - - spin_lock(&file_priv->table_lock); - for (i = 0; i < job->bo_count; i++) { - struct drm_gem_object *bo = idr_find(&file_priv->object_idr, - handles[i]); - if (!bo) { - DRM_DEBUG("Failed to look up GEM BO %d: %d\n", - i, handles[i]); - ret = -ENOENT; - spin_unlock(&file_priv->table_lock); - goto fail; - } - drm_gem_object_get(bo); - job->bo[i] = bo; - } - spin_unlock(&file_priv->table_lock); - -fail: - kvfree(handles); - return ret; + return drm_gem_objects_lookup_user(file_priv, + (void __user *)(uintptr_t)bo_handles, + job->bo_count, &job->bo); } static void