From patchwork Wed Feb 7 17:45:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 10205789 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4F13F6020F for ; Wed, 7 Feb 2018 17:46:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E58D28B72 for ; Wed, 7 Feb 2018 17:46:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32F7328FB3; Wed, 7 Feb 2018 17:46:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E0CCB28B72 for ; Wed, 7 Feb 2018 17:46:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 08BFB6E392; Wed, 7 Feb 2018 17:46:04 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-x242.google.com (mail-qk0-x242.google.com [IPv6:2607:f8b0:400d:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id DC9E76E392 for ; Wed, 7 Feb 2018 17:46:02 +0000 (UTC) Received: by mail-qk0-x242.google.com with SMTP id y204so2161433qkb.10 for ; Wed, 07 Feb 2018 09:46:02 -0800 (PST) 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=DIqTtT/YCnPTCoQBwWIavhgA0VpfTFW2PTk28Lcd35U=; b=SYCsjj5wR8vCFebGLPU2ic+Ms7ZnGnVMY1tlCxXoz7Qo0A0KsxhFjQtHHd+bBiXnlY INWC1QqvAx0vg6o39/FTgLfKF0XIPecuJCzMc1ZP+2hI7etTxNbPCQdKsQeG4bCOFdhr t0MrKKucW8OeMXCDrK+JAfsDqoYsjJnTGSkMQpR/+r0YOeYa8ZWRrCXElZ9KVzcZYIlm GRTbyODJ0EcL0Z023IXc6OuCk28KAtTzxcRj6nFt5kcAbTSsXnvNp8kEoJR+PNZecysn A+QLLEF8jw9JVWSy2U2iZ4OSSN7PnkuAngYra/yUBNv+Jf/EyZqs6ogHhRpvuYD+YHom ATGA== 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=DIqTtT/YCnPTCoQBwWIavhgA0VpfTFW2PTk28Lcd35U=; b=ZI7c1711pm1oFUKpuVl0CTQO4qiaAsppjlWHUMcmM5wp/FDuBHF4XOvRcLebhsx3O5 /kz2KvbivBhlhEh6YfE8TCn5X3Y0IO6mq9bdxP1691Pa3Tzsbcv6rZMgWY08I4xM3byc BQtUv4weH9kPuXxvrxO1+Zk17oTWNxzOwDWX2Mj1FkghrZIvIUUfzTMJmgJarzwOAqR6 /B159uKIM4kmFBAk8s8BA8IlRi+HIpipf9sFvitigpCua10s9jV7jkOB/7JhpBFbTpaU hJDsYu5P/W7WU59ga2NSG2uh5S90GU1yu0vLhgymGwKw1dHDlEHAQwnF87QCqhQ/jJ8j MQQg== X-Gm-Message-State: APf1xPB3lWZboR5SHrdd2jK8Rd+zl87sDvtUNsWyPgb+12bs+mzwk4b7 4Ycs4gmeeYxeAiHMvDet+Ug= X-Google-Smtp-Source: AH8x227308yL1qmasv83JhVfuUCXh20/50pmKHkUMonyhAHSz6G/+TXGyFeV7uGYeNquS9mU37jJhA== X-Received: by 10.55.136.131 with SMTP id k125mr2336639qkd.319.1518025562025; Wed, 07 Feb 2018 09:46:02 -0800 (PST) Received: from localhost (p200300E41F41B00009B231EAB1BE76D4.dip0.t-ipconnect.de. [2003:e4:1f41:b000:9b2:31ea:b1be:76d4]) by smtp.gmail.com with ESMTPSA id g9sm1415674qtg.90.2018.02.07.09.46.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 Feb 2018 09:46:01 -0800 (PST) From: Thierry Reding To: Thierry Reding Subject: [PATCH 2/3] drm/tegra: gem: Make __tegra_gem_mmap() available more widely Date: Wed, 7 Feb 2018 18:45:55 +0100 Message-Id: <20180207174556.25401-2-thierry.reding@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180207174556.25401-1-thierry.reding@gmail.com> References: <20180207174556.25401-1-thierry.reding@gmail.com> 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: Marcel Ziswiler , linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Thierry Reding This function allows mapping a GEM object into a virtual memory address space, which makes it useful outside of the GEM code. While at it, rename the function so it doesn't clash with the function that implements the DRM_TEGRA_GEM_MMAP IOCTL. Signed-off-by: Thierry Reding --- drivers/gpu/drm/tegra/gem.c | 7 +++---- drivers/gpu/drm/tegra/gem.h | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index 0e390ae73559..4b80fe58d4f7 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -464,8 +464,7 @@ const struct vm_operations_struct tegra_bo_vm_ops = { .close = drm_gem_vm_close, }; -static int tegra_gem_mmap(struct drm_gem_object *gem, - struct vm_area_struct *vma) +int __tegra_gem_mmap(struct drm_gem_object *gem, struct vm_area_struct *vma) { struct tegra_bo *bo = to_tegra_bo(gem); @@ -512,7 +511,7 @@ int tegra_drm_mmap(struct file *file, struct vm_area_struct *vma) gem = vma->vm_private_data; - return tegra_gem_mmap(gem, vma); + return __tegra_gem_mmap(gem, vma); } static struct sg_table * @@ -633,7 +632,7 @@ static int tegra_gem_prime_mmap(struct dma_buf *buf, struct vm_area_struct *vma) if (err < 0) return err; - return tegra_gem_mmap(gem, vma); + return __tegra_gem_mmap(gem, vma); } static void *tegra_gem_prime_vmap(struct dma_buf *buf) diff --git a/drivers/gpu/drm/tegra/gem.h b/drivers/gpu/drm/tegra/gem.h index 7e1635a01c81..bb369c129fdd 100644 --- a/drivers/gpu/drm/tegra/gem.h +++ b/drivers/gpu/drm/tegra/gem.h @@ -75,6 +75,7 @@ int tegra_bo_dumb_create(struct drm_file *file, struct drm_device *drm, extern const struct vm_operations_struct tegra_bo_vm_ops; +int __tegra_gem_mmap(struct drm_gem_object *gem, struct vm_area_struct *vma); int tegra_drm_mmap(struct file *file, struct vm_area_struct *vma); struct dma_buf *tegra_gem_prime_export(struct drm_device *drm,