From patchwork Thu Mar 2 21:44:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 9601625 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 9316C60522 for ; Thu, 2 Mar 2017 21:45:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8155B2841C for ; Thu, 2 Mar 2017 21:45:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75BC8285EF; Thu, 2 Mar 2017 21:45:50 +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=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM 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 EB45A28428 for ; Thu, 2 Mar 2017 21:45:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 805EC6E23A; Thu, 2 Mar 2017 21:45:30 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-f178.google.com (mail-qk0-f178.google.com [209.85.220.178]) by gabe.freedesktop.org (Postfix) with ESMTPS id D97636EC6B for ; Thu, 2 Mar 2017 21:45:28 +0000 (UTC) Received: by mail-qk0-f178.google.com with SMTP id n127so147117012qkf.0 for ; Thu, 02 Mar 2017 13:45:28 -0800 (PST) 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=2R50V/VDQRSJ4H01ufyTN9LewEZWJWuxRnV9n739FNY=; b=FFsp+YoKcGMSWtSuQzTgfCIm6t/PXMbha81RshqYu2sy2tM502u3KFIWNOh0EcTaU2 PAEoTezfq583S06Jj3qKxmv5SRKvKOH+Dql92TCvb2nEGOcekaBDtxntA/ZITF8923hk bQoU2LkN4AL+7h26FxcsV8T5VR63rRpUOvbqZUCdenVLG9I1R5WDxT74KEJybDehgWTY q8gmIxwSpbDmAWdXuFyLKmGfv708RWO963OmaNYNIQvuhhXLAZ/exoiiZrXa953s1Ekx BFN5fO+UHQvJrKxhG4OFzzkzfeyfOyGoFOGzajQAXbp/JKkQs149emA4KdbtokPrL5r9 8YiA== X-Gm-Message-State: AMke39k+qziq48MfnNYR7yNPIbX26Pp0bR5IfLMaAKWR31eh9twkydQmrJ8vvRUe6JHu9n3f X-Received: by 10.55.76.209 with SMTP id z200mr19592932qka.282.1488491127986; Thu, 02 Mar 2017 13:45:27 -0800 (PST) Received: from labbott-redhat-machine.redhat.com ([2601:602:9802:a8dc::5ce7]) by smtp.gmail.com with ESMTPSA id r10sm6261671qte.1.2017.03.02.13.45.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Mar 2017 13:45:26 -0800 (PST) From: Laura Abbott To: Sumit Semwal , Riley Andrews , arve@android.com Subject: [RFC PATCH 11/12] staging: android: ion: Make Ion heaps selectable Date: Thu, 2 Mar 2017 13:44:43 -0800 Message-Id: <1488491084-17252-12-git-send-email-labbott@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488491084-17252-1-git-send-email-labbott@redhat.com> References: <1488491084-17252-1-git-send-email-labbott@redhat.com> Cc: devel@driverdev.osuosl.org, romlem@google.com, Greg Kroah-Hartman , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org, Mark Brown , Daniel Vetter , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.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 Currently, all heaps are compiled in all the time. In switching to a better platform model, let's allow these to be compiled out for good measure. Signed-off-by: Laura Abbott --- drivers/staging/android/ion/Kconfig | 32 ++++++++++++++++++++ drivers/staging/android/ion/Makefile | 8 +++-- drivers/staging/android/ion/ion_priv.h | 53 ++++++++++++++++++++++++++++++++-- 3 files changed, 87 insertions(+), 6 deletions(-) diff --git a/drivers/staging/android/ion/Kconfig b/drivers/staging/android/ion/Kconfig index 0c91b2b..2e97990 100644 --- a/drivers/staging/android/ion/Kconfig +++ b/drivers/staging/android/ion/Kconfig @@ -17,3 +17,35 @@ config ION_TEST Choose this option to create a device that can be used to test the kernel and device side ION functions. +config ION_SYSTEM_HEAP + bool "Ion system heap" + depends on ION + help + Choose this option to enable the Ion system heap. The system heap + is backed by pages from the buddy allocator. If in doubt, say Y. + +config ION_CARVEOUT_HEAP + bool "Ion carveout heap support" + depends on ION + help + Choose this option to enable carveout heaps with Ion. Carveout heaps + are backed by memory reserved from the system. Allocation times are + typically faster at the cost of memory not being used. Unless you + know your system has these regions, you should say N here. + +config ION_CHUNK_HEAP + bool "Ion chunk heap support" + depends on ION + help + Choose this option to enable chunk heaps with Ion. This heap is + similar in function the carveout heap but memory is broken down + into smaller chunk sizes, typically corresponding to a TLB size. + Unless you know your system has these regions, you should say N here. + +config ION_CMA_HEAP + bool "Ion CMA heap support" + depends on ION && CMA + help + Choose this option to enable CMA heaps with Ion. This heap is backed + by the Contiguous Memory Allocator (CMA). If your system has these + regions, you should say Y here. diff --git a/drivers/staging/android/ion/Makefile b/drivers/staging/android/ion/Makefile index 9457090..eef022b 100644 --- a/drivers/staging/android/ion/Makefile +++ b/drivers/staging/android/ion/Makefile @@ -1,6 +1,8 @@ -obj-$(CONFIG_ION) += ion.o ion-ioctl.o ion_heap.o \ - ion_page_pool.o ion_system_heap.o \ - ion_carveout_heap.o ion_chunk_heap.o ion_cma_heap.o +obj-$(CONFIG_ION) += ion.o ion-ioctl.o ion_heap.o +obj-$(CONFIG_ION_SYSTEM_HEAP) += ion_system_heap.o ion_page_pool.o +obj-$(CONFIG_ION_CARVEOUT_HEAP) += ion_carveout_heap.o +obj-$(CONFIG_ION_CHUNK_HEAP) += ion_chunk_heap.o +obj-$(CONFIG_ION_CMA_HEAP) += ion_cma_heap.o obj-$(CONFIG_ION_TEST) += ion_test.o ifdef CONFIG_COMPAT obj-$(CONFIG_ION) += compat_ion.o diff --git a/drivers/staging/android/ion/ion_priv.h b/drivers/staging/android/ion/ion_priv.h index b09bc7c..6eafe0d 100644 --- a/drivers/staging/android/ion/ion_priv.h +++ b/drivers/staging/android/ion/ion_priv.h @@ -369,21 +369,68 @@ size_t ion_heap_freelist_size(struct ion_heap *heap); * heaps as appropriate. */ + struct ion_heap *ion_heap_create(struct ion_platform_heap *heap_data); void ion_heap_destroy(struct ion_heap *heap); + +#ifdef CONFIG_ION_SYSTEM_HEAP struct ion_heap *ion_system_heap_create(struct ion_platform_heap *unused); void ion_system_heap_destroy(struct ion_heap *heap); - struct ion_heap *ion_system_contig_heap_create(struct ion_platform_heap *heap); void ion_system_contig_heap_destroy(struct ion_heap *heap); - +#else +static inline struct ion_heap * ion_system_heap_create( + struct ion_platform_heap *unused) +{ + return ERR_PTR(-ENODEV); +} +static inline void ion_system_heap_destroy(struct ion_heap *heap) { } + +static inline struct ion_heap *ion_system_contig_heap_create( + struct ion_platform_heap *heap) +{ + return ERR_PTR(-ENODEV); +} + +static inline void ion_system_contig_heap_destroy(struct ion_heap *heap) { } +#endif + +#ifdef CONFIG_ION_CARVEOUT_HEAP struct ion_heap *ion_carveout_heap_create(struct ion_platform_heap *heap_data); void ion_carveout_heap_destroy(struct ion_heap *heap); - +#else +static inline struct ion_heap *ion_carveout_heap_create( + struct ion_platform_heap *heap_data) +{ + return ERR_PTR(-ENODEV); +} +static inline void ion_carveout_heap_destroy(struct ion_heap *heap) { } +#endif + +#ifdef CONFIG_ION_CHUNK_HEAP struct ion_heap *ion_chunk_heap_create(struct ion_platform_heap *heap_data); void ion_chunk_heap_destroy(struct ion_heap *heap); +#else +static inline struct ion_heap *ion_chunk_heap_create( + struct ion_platform_heap *heap_data) +{ + return ERR_PTR(-ENODEV); +} +static inline void ion_chunk_heap_destroy(struct ion_heap *heap) { } + +#endif + +#ifdef CONFIG_ION_CMA_HEAP struct ion_heap *ion_cma_heap_create(struct ion_platform_heap *data); void ion_cma_heap_destroy(struct ion_heap *heap); +#else +static inline struct ion_heap *ion_cma_heap_create( + struct ion_platform_heap *data) +{ + return ERR_PTR(-ENODEV); +} +static inline void ion_cma_heap_destroy(struct ion_heap *heap) { } +#endif /** * functions for creating and destroying a heap pool -- allows you