From patchwork Wed Aug 29 03:52:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangfei Gao X-Patchwork-Id: 11029 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D8CF423E29 for ; Wed, 29 Aug 2012 14:01:13 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id E714BA181E9 for ; Wed, 29 Aug 2012 14:00:40 +0000 (UTC) Received: by iafj25 with SMTP id j25so1050410iaf.11 for ; Wed, 29 Aug 2012 07:01:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to :date:message-id:x-mailer:in-reply-to:references :x-originalarrivaltime:x-mailman-approved-at:cc:subject:x-beenthere :x-mailman-version:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-gm-message-state; bh=MPQsE1TeAYDgAS8Vkko+fj/2vaeggfIjcLQDELHwcaE=; b=DRE4TBYJCoKnpnPqps9Bad6mkFXTIjSbTKKOaS9nPjSw5ApUEp7qFt1gwic0MEunP2 yozPqqcFm4qbtyv0rPtNs/gvkXvSrLdEYcWeUvBkD2vneMf85gNGTpPmuT40knw+evWU 9Pf1QtPJsc4R+j33KK5aNaQe9xE7qosqftGAh0wyl3mxXd5EDbmtodoKL2z8J8u3E7GL KGR7QS8JeXLgDxvy/QPa50lRU/kM30UPtdnMD4E7H0JHPSq44yi8z+3kXL5hBYn3c0IK axv1axbp8DUSZK2tblfFx2WBu/F7MuiCo2vrouHu4lkUD7Px7QwvL7FqbBOcZAN9h7dy yxKA== Received: by 10.50.10.201 with SMTP id k9mr1696421igb.28.1346248872609; Wed, 29 Aug 2012 07:01:12 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp86877igc; Wed, 29 Aug 2012 07:01:11 -0700 (PDT) Received: by 10.204.133.194 with SMTP id g2mr1079611bkt.13.1346248871141; Wed, 29 Aug 2012 07:01:11 -0700 (PDT) Received: from mombin.canonical.com (mombin.canonical.com. [91.189.95.16]) by mx.google.com with ESMTP id hw3si15944597bkc.111.2012.08.29.07.01.09; Wed, 29 Aug 2012 07:01:11 -0700 (PDT) Received-SPF: neutral (google.com: 91.189.95.16 is neither permitted nor denied by best guess record for domain of linaro-mm-sig-bounces@lists.linaro.org) client-ip=91.189.95.16; Authentication-Results: mx.google.com; spf=neutral (google.com: 91.189.95.16 is neither permitted nor denied by best guess record for domain of linaro-mm-sig-bounces@lists.linaro.org) smtp.mail=linaro-mm-sig-bounces@lists.linaro.org Received: from localhost ([127.0.0.1] helo=mombin.canonical.com) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1T6ipP-0003OH-4i; Wed, 29 Aug 2012 14:01:07 +0000 Received: from na3sys009aog136.obsmtp.com ([74.125.149.85]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1T6ZND-0005OJ-Tt for linaro-mm-sig@lists.linaro.org; Wed, 29 Aug 2012 03:55:24 +0000 Received: from MSI-MTA.marvell.com ([65.219.4.132]) (using TLSv1) by na3sys009aob136.postini.com ([74.125.148.12]) with SMTP ID DSNKUD2SqXHCxmQ8rlIsHnawPDv0YgeDebxG@postini.com; Tue, 28 Aug 2012 20:55:23 PDT Received: from maili.marvell.com ([10.68.76.210]) by MSI-MTA.marvell.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 28 Aug 2012 20:52:24 -0700 Received: from localhost (unknown [10.26.128.111]) by maili.marvell.com (Postfix) with ESMTP id CA13E4E510; Tue, 28 Aug 2012 20:52:24 -0700 (PDT) From: Zhangfei Gao To: Rebecca Schultz Zavin , "linaro-mm-sig@lists.linaro.org" , Haojian Zhuang Date: Wed, 29 Aug 2012 11:52:19 +0800 Message-Id: <1346212340-25236-3-git-send-email-zhangfei.gao@marvell.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1346212340-25236-1-git-send-email-zhangfei.gao@marvell.com> References: <1346212340-25236-1-git-send-email-zhangfei.gao@marvell.com> X-OriginalArrivalTime: 29 Aug 2012 03:52:24.0969 (UTC) FILETIME=[B362A790:01CD8599] X-Mailman-Approved-At: Wed, 29 Aug 2012 14:01:04 +0000 Cc: Zhangfei Gao Subject: [Linaro-mm-sig] [PATCH 2/3] gpu: ion: carveout_heap page wised cache flush X-BeenThere: linaro-mm-sig@lists.linaro.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Unified memory management interest group." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linaro-mm-sig-bounces@lists.linaro.org Errors-To: linaro-mm-sig-bounces@lists.linaro.org X-Gm-Message-State: ALoCoQmYwz0kGZ51SPEBiSDPu/bj99+c4VJK5ItR99Xf3GpYu+FFZxEM3/7KjIM347EiMNZBgVsa Extend dirty bit per PAGE_SIZE Page wised cache flush is supported and only takes effect for dirty buffer Signed-off-by: Zhangfei Gao --- drivers/gpu/ion/ion_carveout_heap.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/ion/ion_carveout_heap.c b/drivers/gpu/ion/ion_carveout_heap.c index 13f6e8d..24f8ef2 100644 --- a/drivers/gpu/ion/ion_carveout_heap.c +++ b/drivers/gpu/ion/ion_carveout_heap.c @@ -88,25 +88,36 @@ struct sg_table *ion_carveout_heap_map_dma(struct ion_heap *heap, struct ion_buffer *buffer) { struct sg_table *table; - int ret; + struct scatterlist *sg; + int ret, i; + int nents = PAGE_ALIGN(buffer->size) / PAGE_SIZE; + struct page *page = phys_to_page(buffer->priv_phys); table = kzalloc(sizeof(struct sg_table), GFP_KERNEL); if (!table) return ERR_PTR(-ENOMEM); - ret = sg_alloc_table(table, 1, GFP_KERNEL); + + ret = sg_alloc_table(table, nents, GFP_KERNEL); if (ret) { kfree(table); return ERR_PTR(ret); } - sg_set_page(table->sgl, phys_to_page(buffer->priv_phys), buffer->size, - 0); + + sg = table->sgl; + for (i = 0; i < nents; i++) { + sg_set_page(sg, page + i, PAGE_SIZE, 0); + sg = sg_next(sg); + } + return table; } void ion_carveout_heap_unmap_dma(struct ion_heap *heap, struct ion_buffer *buffer) { - sg_free_table(buffer->sg_table); + if (buffer->sg_table) + sg_free_table(buffer->sg_table); + kfree(buffer->sg_table); } void *ion_carveout_heap_map_kernel(struct ion_heap *heap,