From patchwork Tue Dec 14 12:23:51 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Tomi Valkeinen <tomi.valkeinen@nokia.com>
X-Patchwork-Id: 409701
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBECOXXB025398
	for <patchwork-linux-fbdev@patchwork.kernel.org>;
	Tue, 14 Dec 2010 12:24:34 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758846Ab0LNMYW (ORCPT
	<rfc822;patchwork-linux-fbdev@patchwork.kernel.org>);
	Tue, 14 Dec 2010 07:24:22 -0500
Received: from smtp.nokia.com ([147.243.1.48]:56786 "EHLO mgw-sa02.nokia.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1758769Ab0LNMYU (ORCPT <rfc822;linux-fbdev@vger.kernel.org>);
	Tue, 14 Dec 2010 07:24:20 -0500
Received: from [172.21.39.59] (esdhcp03959.research.nokia.com [172.21.39.59])
	by mgw-sa02.nokia.com (Switch-3.4.3/Switch-3.4.3) with ESMTP id
	oBECNpL2012147; Tue, 14 Dec 2010 14:23:52 +0200
Subject: Re: Mainline OMAP3 breakage (and other OMAP?)
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
To: ext Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
	Paul Mundt <lethal@linux-sh.org>, Tony Lindgren <tony@atomide.com>,
	linux-fbdev@vger.kernel.org, linux-omap@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
In-Reply-To: <20101203130724.GB30957@n2100.arm.linux.org.uk>
References: <20101202211421.GG10461@n2100.arm.linux.org.uk>
	<20101202215837.GW17222@atomide.com>
	<20101202221612.GJ10461@n2100.arm.linux.org.uk>
	<20101202223208.GA17222@atomide.com>
	<20101203030954.GD3367@linux-sh.org>
	<20101203084102.GA30957@n2100.arm.linux.org.uk>
	<AANLkTim3573_MUZNpo2+tKa=ZJgQf26x5of_ZkMM6BR8@mail.gmail.com>
	<20101203130724.GB30957@n2100.arm.linux.org.uk>
Organization: Nokia
Date: Tue, 14 Dec 2010 14:23:51 +0200
Message-ID: <1292329431.6893.113.camel@tubuntu>
Mime-Version: 1.0
X-Mailer: Evolution 2.30.3 
X-Nokia-AV: Clean
Sender: linux-fbdev-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-fbdev.vger.kernel.org>
X-Mailing-List: linux-fbdev@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Tue, 14 Dec 2010 12:24:34 +0000 (UTC)


diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c
index 2fd7e52..9441e2e 100644
--- a/drivers/video/omap2/vram.c
+++ b/drivers/video/omap2/vram.c
@@ -551,7 +551,7 @@ void __init omap_vram_reserve_sdram_memblock(void)
 	if (!size)
 		return;
 
-	size = PAGE_ALIGN(size);
+	size = ALIGN(size, SZ_2M);
 
 	if (paddr) {
 		if (paddr & ~PAGE_MASK) {
@@ -576,7 +576,7 @@ void __init omap_vram_reserve_sdram_memblock(void)
 			return;
 		}
 	} else {
-		paddr = memblock_alloc(size, PAGE_SIZE);
+		paddr = memblock_alloc(size, SZ_2M);
 	}
 
 	memblock_free(paddr, size);