From patchwork Thu Jan 11 21:44:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 10158653 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 0072C60170 for ; Thu, 11 Jan 2018 21:44:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4A5C286EF for ; Thu, 11 Jan 2018 21:44:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D94FF2874F; Thu, 11 Jan 2018 21:44:37 +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 48E51286EF for ; Thu, 11 Jan 2018 21:44:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 23BE76E4A6; Thu, 11 Jan 2018 21:44:33 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt0-x243.google.com (mail-qt0-x243.google.com [IPv6:2607:f8b0:400d:c0d::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 47A906E4A6; Thu, 11 Jan 2018 21:44:31 +0000 (UTC) Received: by mail-qt0-x243.google.com with SMTP id f2so3720721qtj.4; Thu, 11 Jan 2018 13:44:31 -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=496tRsV910jq7ia+sCRDVe10Xv62i4Ky/Wip+yqkB0s=; b=FTCHbqWN+EkKWIyNIBHsZia/AiqUx45RzXlT3yj1uOwCzfhjnd47D3bqelTsUJs4JS rKbG2uEtL+YbuFwUUU5QBF4KzzlNWhnFHRxZYV71V8j6UWCKqArYpmDlcc0HDaK7Uxqs vji6vkrmoMXIb9e/Fz3Ov9K96WjMDko/usN02inP7wvhNL1iDI6kR1bt3CZec6kt/DiU 88TTPVSpVyVdlNJ/MqyU1zKSU/052ztOuqkgUSJLwZg9Byjgc4bipr9E2y8y5kR9zL2u IsO1r3J5iVDCsr/gFeuyVoTuTQTW4aYZNHfX5XiGoa/bCYjTzRSvgW92bt/t62KKNZzH DNEA== 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=496tRsV910jq7ia+sCRDVe10Xv62i4Ky/Wip+yqkB0s=; b=MuM7o4e+JvSs5+eUDZe5IxAsEho7QaSF/ejpCOy26RyllNRrQaIaO1YOapLl5/Fbo+ Mcg9GzK19YyEwWKBzp5HGkorfpHPxNJrFAYKMgEzcTs+yLbPrFJU0dC0wWW3GTmTfjAe zV+ULRJgZ65E5cVATPa4853ECHpGOc8ef/YX5Vtk9H4dQrauBz5d1pT0KUIS1fLruQl9 3QDiOF8y2cpeFTnwYG+bGjk9n31GNSDxp8rmHD0pleUqrz32ylHmeiAS9PbBQUfVeMdS XxvfPYCOBctecW97vk41JzuIF0vii+awY9pu23c5bNwcdLMa16i+M3SfosL2dA1wpJDq wO5w== X-Gm-Message-State: AKwxytcJkeAKtTNb/eihYdfovtBsyXFThCKCsuCrT0LqBbv8at2XFzXX GeXZabnmXTvoZU+0/gXmLRM= X-Google-Smtp-Source: ACJfBosTMGlNkRCsaV/pSjxbsZu0N2TyHT7ACSvFtDDxSVk2fTFoWwhAoeP92LX7BDtdxMay8nZe9A== X-Received: by 10.200.41.131 with SMTP id 3mr33412854qts.247.1515707070129; Thu, 11 Jan 2018 13:44:30 -0800 (PST) Received: from localhost (p200300E41F21CF00227DB10B7BBDB590.dip0.t-ipconnect.de. [2003:e4:1f21:cf00:227d:b10b:7bbd:b590]) by smtp.gmail.com with ESMTPSA id d50sm1375062qtd.38.2018.01.11.13.44.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Jan 2018 13:44:29 -0800 (PST) From: Thierry Reding To: Ben Skeggs Subject: [PATCH 4/5] drm/nouveau: prime: Implement mmap() Date: Thu, 11 Jan 2018 22:44:19 +0100 Message-Id: <20180111214420.26203-4-thierry.reding@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180111214420.26203-1-thierry.reding@gmail.com> References: <20180111214420.26203-1-thierry.reding@gmail.com> Cc: linux-tegra@vger.kernel.org, Daniel Vetter , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org 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-Virus-Scanned: ClamAV using ClamSMTP From: Thierry Reding Provide an implementation of mmap() for PRIME exported buffers. This allows userspace to map these buffers and access them using the CPU. Signed-off-by: Thierry Reding --- drivers/gpu/drm/nouveau/nouveau_prime.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c index 63cf4aca2d8e..5d885d7cb059 100644 --- a/drivers/gpu/drm/nouveau/nouveau_prime.c +++ b/drivers/gpu/drm/nouveau/nouveau_prime.c @@ -50,6 +50,37 @@ static void nouveau_gem_prime_kunmap(struct dma_buf *buf, unsigned long page, { } +static inline u64 nouveau_bo_mmap_offset(struct nouveau_bo *bo) +{ + return drm_vma_node_offset_addr(&bo->bo.vma_node) >> PAGE_SHIFT; +} + +static int nouveau_gem_prime_mmap(struct dma_buf *buf, + struct vm_area_struct *vma) +{ + struct nouveau_bo *bo = nouveau_gem_object(buf->priv); + struct drm_gem_object *obj = buf->priv; + int ret; + + /* check for valid size */ + if (obj->size < vma->vm_end - vma->vm_start) + return -EINVAL; + + vma->vm_pgoff += nouveau_bo_mmap_offset(bo); + + if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET)) + return drm_legacy_mmap(vma->vm_file, vma); + + ret = drm_vma_node_allow(&obj->vma_node, vma->vm_file->private_data); + if (ret) + return ret; + + ret = ttm_bo_mmap(vma->vm_file, vma, bo->bo.bdev); + drm_vma_node_revoke(&obj->vma_node, vma->vm_file->private_data); + + return ret; +} + static void *nouveau_gem_prime_vmap(struct dma_buf *buf) { struct nouveau_bo *bo = nouveau_gem_object(buf->priv); @@ -79,6 +110,7 @@ static const struct dma_buf_ops nouveau_gem_prime_dmabuf_ops = { .unmap_atomic = nouveau_gem_prime_kunmap_atomic, .map = nouveau_gem_prime_kmap, .unmap = nouveau_gem_prime_kunmap, + .mmap = nouveau_gem_prime_mmap, .vmap = nouveau_gem_prime_vmap, .vunmap = nouveau_gem_prime_vunmap, };