From patchwork Fri Jun 10 09:54:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 868152 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5A9t40s001398 for ; Fri, 10 Jun 2011 09:55:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755082Ab1FJJzV (ORCPT ); Fri, 10 Jun 2011 05:55:21 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:15443 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755211Ab1FJJzS (ORCPT ); Fri, 10 Jun 2011 05:55:18 -0400 Received: from eu_spt1 (mailout2.w1.samsung.com [210.118.77.12]) by mailout2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTP id <0LMK005Q5JJPJT@mailout2.w1.samsung.com>; Fri, 10 Jun 2011 10:55:05 +0100 (BST) Received: from linux.samsung.com ([106.116.38.10]) by spt1.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LMK00DGDJJOMY@spt1.w1.samsung.com>; Fri, 10 Jun 2011 10:55:02 +0100 (BST) Received: from mcdsrvbld02.digital.local (unknown [106.116.37.23]) by linux.samsung.com (Postfix) with ESMTP id 32531270058; Fri, 10 Jun 2011 11:55:20 +0200 (CEST) Date: Fri, 10 Jun 2011 11:54:58 +0200 From: Marek Szyprowski Subject: [PATCH 10/10] ARM: S5PV210: add CMA support for FIMC devices on Aquila board In-reply-to: <1307699698-29369-1-git-send-email-m.szyprowski@samsung.com> To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-mm@kvack.org, linaro-mm-sig@lists.linaro.org Cc: Michal Nazarewicz , Marek Szyprowski , Kyungmin Park , Andrew Morton , KAMEZAWA Hiroyuki , Ankita Garg , Daniel Walker , Johan MOSSBERG , Mel Gorman , Arnd Bergmann , Jesse Barker Message-id: <1307699698-29369-11-git-send-email-m.szyprowski@samsung.com> MIME-version: 1.0 X-Mailer: git-send-email 1.7.2.5 Content-type: TEXT/PLAIN Content-transfer-encoding: 7BIT References: <1307699698-29369-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 10 Jun 2011 09:55:38 +0000 (UTC) This patch is an example how CMA can be activated for particular devices in the system. It creates one CMA region and assigns it to all s5p-fimc devices on Samsung Aquila S5PC110 board. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park --- arch/arm/mach-s5pv210/Kconfig | 1 + arch/arm/mach-s5pv210/mach-aquila.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index 37b5a97..c09a92c 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig @@ -64,6 +64,7 @@ menu "S5PC110 Machines" config MACH_AQUILA bool "Aquila" select CPU_S5PV210 + select CMA select S3C_DEV_FB select S5P_DEV_FIMC0 select S5P_DEV_FIMC1 diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c index 4e1d8ff..8c404e5 100644 --- a/arch/arm/mach-s5pv210/mach-aquila.c +++ b/arch/arm/mach-s5pv210/mach-aquila.c @@ -21,6 +21,8 @@ #include #include #include +#include +#include #include #include @@ -650,6 +652,19 @@ static void __init aquila_map_io(void) s5p_set_timer_source(S5P_PWM3, S5P_PWM4); } +unsigned long cma_area_start; +unsigned long cma_area_size = 32 << 20; + +static void __init aquila_reserve(void) +{ + unsigned long ret = cma_reserve(cma_area_start, cma_area_size); + + if (!IS_ERR_VALUE(ret)) { + cma_area_start = ret; + printk(KERN_INFO "cma: reserved %ld bytes at %lx\n", cma_area_size, cma_area_start); + } +} + static void __init aquila_machine_init(void) { /* PMIC */ @@ -672,6 +687,16 @@ static void __init aquila_machine_init(void) s3c_fb_set_platdata(&aquila_lcd_pdata); platform_add_devices(aquila_devices, ARRAY_SIZE(aquila_devices)); + + if (cma_area_start) { + struct cma *cma; + cma = cma_create(cma_area_start, cma_area_size); + if (cma) { + set_dev_cma_area(&s5p_device_fimc0.dev, cma); + set_dev_cma_area(&s5p_device_fimc1.dev, cma); + set_dev_cma_area(&s5p_device_fimc2.dev, cma); + } + } } MACHINE_START(AQUILA, "Aquila") @@ -683,4 +708,5 @@ MACHINE_START(AQUILA, "Aquila") .map_io = aquila_map_io, .init_machine = aquila_machine_init, .timer = &s5p_timer, + .reserve = aquila_reserve, MACHINE_END