Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp65131pxb; Mon, 2 Nov 2020 14:09:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJwnndILMc+fQxQ3SikzScEKcm6z/9OYKK4SV0ffz4g0mJkSCsrD2sSnbt12+m0pmman6Wh9 X-Received: by 2002:aa7:c1d3:: with SMTP id d19mr19521250edp.293.1604354998819; Mon, 02 Nov 2020 14:09:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604354998; cv=none; d=google.com; s=arc-20160816; b=dc1ujuFPMn1FSzpT1BqDOIU6KdAu6HldX8wpAZivqKlOAahuM/c0VTdZaqaYYSG4Yf 6Si034DCThlwXxVN/FFaUu7L3XHx1+FtakM3MtmLhgD4U5fSp3in2wbLMJOc1VromiiL 1RkXghT44jJe2V1jb+KZQ5PQefl/ZPz7aRJHzRMFqVC8fFjyv29Wa5I4bfbEN+97/Prs dr2PNGlSGllmAWToOTnGxjVvxTbAAQdAc0yv5fp3gqGOa5GWF3C2erbRuk/zB8OikUHE c5l4wVfhAY0KRxU1PhVJ+7W+LC+gOLigMGMik4HFUGDmMrPDMbYMTosQbEjrlYviGfBG D4lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=hyL5Pk/7DcPL61WehfFlCyDZs+TAmJ/qW0hlmGIVnSY=; b=rMgzmL2OinlANt7QmZx2KFk9bBnAzego6qkty197MBhX1hO4hRFEg4c65cyB1Dd8uU GzFK0DRAmccljxX0sFa3j3WlpYu+LZJwQYb3067NcanZfU7Gg5hIROM0a8x/rlT1Punn kRSPDavgLJ6qshfepvmnDOGk23lLfYaW0iGpKsDn2Lo/w9hSIj+h/Y/ek5acN4F4XLI8 uV4/P8b/T6vtHsVMmEAPtqWlXl55i7GWOCluZHPGB//9cn81OBiGAJWsNIuwFUVPuKiq uXqaeZQ9mBybKxgaZum6wdwAmlUAI3UtqNN/Ks/kCN4mXP8POOQLCvvNPPEgfOeQZEVY msfQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h22si12544553ejf.69.2020.11.02.14.09.34; Mon, 02 Nov 2020 14:09:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726114AbgKBWHh (ORCPT + 99 others); Mon, 2 Nov 2020 17:07:37 -0500 Received: from aposti.net ([89.234.176.197]:44762 "EHLO aposti.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726109AbgKBWHh (ORCPT ); Mon, 2 Nov 2020 17:07:37 -0500 From: Paul Cercueil To: David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann Cc: od@zcrc.me, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH 3/5] drm: Add and export function drm_gem_cma_mmap_noncoherent Date: Mon, 2 Nov 2020 22:06:49 +0000 Message-Id: <20201102220651.22069-4-paul@crapouillou.net> In-Reply-To: <20201102220651.22069-1-paul@crapouillou.net> References: <20201102220651.22069-1-paul@crapouillou.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This function can be used by drivers that need to mmap dumb buffers created with non-coherent backing memory. Signed-off-by: Paul Cercueil --- drivers/gpu/drm/drm_gem_cma_helper.c | 39 ++++++++++++++++++++++++++++ include/drm/drm_gem_cma_helper.h | 2 ++ 2 files changed, 41 insertions(+) diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c index 3bdd67795e20..4ed63f4896bd 100644 --- a/drivers/gpu/drm/drm_gem_cma_helper.c +++ b/drivers/gpu/drm/drm_gem_cma_helper.c @@ -387,6 +387,45 @@ int drm_gem_cma_mmap(struct file *filp, struct vm_area_struct *vma) } EXPORT_SYMBOL_GPL(drm_gem_cma_mmap); +/** + * drm_gem_cma_mmap_noncoherent - memory-map a CMA GEM object with + * non-coherent cache attribute + * @filp: file object + * @vma: VMA for the area to be mapped + * + * Just like drm_gem_cma_mmap, but for a GEM object backed by non-coherent + * memory. + * + * Returns: + * 0 on success or a negative error code on failure. + */ +int drm_gem_cma_mmap_noncoherent(struct file *filp, struct vm_area_struct *vma) +{ + struct drm_gem_cma_object *cma_obj; + int ret; + + ret = drm_gem_mmap(filp, vma); + if (ret) + return ret; + + cma_obj = to_drm_gem_cma_obj(vma->vm_private_data); + + /* + * Clear the VM_PFNMAP flag that was set by drm_gem_mmap(), and set the + * vm_pgoff (used as a fake buffer offset by DRM) to 0 as we want to map + * the whole buffer. + */ + vma->vm_flags &= ~VM_PFNMAP; + vma->vm_pgoff = 0; + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); + + return remap_pfn_range(vma, vma->vm_start, + cma_obj->paddr >> PAGE_SHIFT, + vma->vm_end - vma->vm_start, + vma->vm_page_prot); +} +EXPORT_SYMBOL_GPL(drm_gem_cma_mmap_noncoherent); + #ifndef CONFIG_MMU /** * drm_gem_cma_get_unmapped_area - propose address for mapping in noMMU cases diff --git a/include/drm/drm_gem_cma_helper.h b/include/drm/drm_gem_cma_helper.h index d0e6a1cd0950..6b01ad5581c3 100644 --- a/include/drm/drm_gem_cma_helper.h +++ b/include/drm/drm_gem_cma_helper.h @@ -83,6 +83,8 @@ int drm_gem_cma_dumb_create_noncoherent(struct drm_file *file_priv, /* set vm_flags and we can change the VM attribute to other one at here */ int drm_gem_cma_mmap(struct file *filp, struct vm_area_struct *vma); +int drm_gem_cma_mmap_noncoherent(struct file *filep, struct vm_area_struct *vma); + /* allocate physical memory */ struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm, size_t size); -- 2.28.0