From patchwork Mon Nov 3 09:27:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 5215471 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CE91FC11AC for ; Mon, 3 Nov 2014 09:28:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 21B652015E for ; Mon, 3 Nov 2014 09:28:47 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4BD3420145 for ; Mon, 3 Nov 2014 09:28:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 79E5D6E473; Mon, 3 Nov 2014 01:28:45 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by gabe.freedesktop.org (Postfix) with ESMTP id 458B16E481 for ; Mon, 3 Nov 2014 01:28:44 -0800 (PST) Received: by mail-pa0-f53.google.com with SMTP id kx10so11799927pab.40 for ; Mon, 03 Nov 2014 01:28:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=D8F3vN4z9LBd24J4MSP7qUoo9gJxqwqJiTJEBnuThzQ=; b=FqM8X9NTBOcc32/ieChgEErevyTsCqF9+k5xolei7DUjzjv5OFV//fnO4vt8rHBnkq NzQZdwx8jFfH8Xw0hH/J6EsrsQ/r0JpjG4eHQ/etmPuytSAMQv0Krey3gOse0XOxYkeZ gx+fAqx0oMtFBsmEL9eNrNB3Ik8J2ZpmYTCq03AAjRj16Dm6bIhu0Nz/hwDxHXqTa5sy CZg9J5rcYII37EkD82dtExxkvqYe5hamzKcaSnqjf0TmbPtCeEOlutxji0pI86fWnnt1 uz0Mal3ScwV6HnKzk6Sy2gxknCXN9c5NA9g89qklo3oKh/RpQL5RdvCuFXlRwDOopVek zZbw== X-Received: by 10.66.160.193 with SMTP id xm1mr2351768pab.115.1415006924173; Mon, 03 Nov 2014 01:28:44 -0800 (PST) Received: from localhost ([216.228.120.20]) by mx.google.com with ESMTPSA id r1sm16611386pdp.95.2014.11.03.01.28.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Nov 2014 01:28:43 -0800 (PST) From: Thierry Reding To: Thierry Reding Subject: [PATCH 10/17] drm/tegra: gem: Use dma_mmap_writecombine() Date: Mon, 3 Nov 2014 10:27:41 +0100 Message-Id: <1415006868-318-10-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1415006868-318-1-git-send-email-thierry.reding@gmail.com> References: <1415006868-318-1-git-send-email-thierry.reding@gmail.com> Cc: dri-devel@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-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 From: Thierry Reding Use the existing API rather than open-coding equivalent functionality in the driver. Signed-off-by: Thierry Reding --- drivers/gpu/drm/tegra/gem.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index 5bc59c5109e0..b513df33f17a 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -310,6 +310,7 @@ const struct vm_operations_struct tegra_bo_vm_ops = { int tegra_drm_mmap(struct file *file, struct vm_area_struct *vma) { + unsigned long vm_pgoff = vma->vm_pgoff; struct drm_gem_object *gem; struct tegra_bo *bo; int ret; @@ -321,12 +322,19 @@ int tegra_drm_mmap(struct file *file, struct vm_area_struct *vma) gem = vma->vm_private_data; bo = to_tegra_bo(gem); - ret = remap_pfn_range(vma, vma->vm_start, bo->paddr >> PAGE_SHIFT, - vma->vm_end - vma->vm_start, vma->vm_page_prot); - if (ret) + vma->vm_flags &= ~VM_PFNMAP; + vma->vm_pgoff = 0; + + ret = dma_mmap_writecombine(gem->dev->dev, vma, bo->vaddr, bo->paddr, + gem->size); + if (ret) { drm_gem_vm_close(vma); + return ret; + } + + vma->vm_pgoff = vm_pgoff; - return ret; + return 0; } static struct sg_table *