Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afedec18 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAP: Add VRAM manager 



Add a Video RAM manager for OMAP 2 and 3 platforms. VRAM manager is used
to allocate large continuous blocks of SDRAM or SRAM. The features VRAM
manager has that are missing from dma_alloc_* functions are:

- Support for OMAP2's SRAM
- Allocate without ioremapping
- Allocate at defined physical addresses
- Allows larger VRAM area and larger allocations

The upcoming DSS2 uses VRAM manager.

VRAM area size can be defined in kernel config, board file or with
kernel boot parameters. Board file definition overrides kernel config,
and boot parameter overrides kernel config and board file.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@nokia.com>
parent dadd2bb9

arch/arm/mach-omap2/io.c

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <plat/sdrc.h>

#include <plat/gpmc.h>

#include <plat/serial.h>

#include <plat/vram.h>



#ifndef CONFIG_ARCH_OMAP4	/* FIXME: Remove this once clkdev is ready */

#include "clock.h"
@@ -264,6 +265,7 @@ void __init omap2_map_common_io(void) 
	omap2_check_revision();

	omap_sram_init();

	omapfb_reserve_sdram();

	omap_vram_reserve_sdram();

}



/*

arch/arm/plat-omap/include/plat/vram.h

0 → 100644
+62 −0
Original line number Diff line number Diff line 
/*

 * VRAM manager for OMAP

 *

 * Copyright (C) 2009 Nokia Corporation

 * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License along

 * with this program; if not, write to the Free Software Foundation, Inc.,

 * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */



#ifndef __OMAP_VRAM_H__

#define __OMAP_VRAM_H__



#include <linux/types.h>



#define OMAP_VRAM_MEMTYPE_SDRAM		0

#define OMAP_VRAM_MEMTYPE_SRAM		1

#define OMAP_VRAM_MEMTYPE_MAX		1



extern int omap_vram_add_region(unsigned long paddr, size_t size);

extern int omap_vram_free(unsigned long paddr, size_t size);

extern int omap_vram_alloc(int mtype, size_t size, unsigned long *paddr);

extern int omap_vram_reserve(unsigned long paddr, size_t size);

extern void omap_vram_get_info(unsigned long *vram, unsigned long *free_vram,

		unsigned long *largest_free_block);



#ifdef CONFIG_OMAP2_VRAM

extern void omap_vram_set_sdram_vram(u32 size, u32 start);

extern void omap_vram_set_sram_vram(u32 size, u32 start);



extern void omap_vram_reserve_sdram(void);

extern unsigned long omap_vram_reserve_sram(unsigned long sram_pstart,

					    unsigned long sram_vstart,

					    unsigned long sram_size,

					    unsigned long pstart_avail,

					    unsigned long size_avail);

#else

static inline void omap_vram_set_sdram_vram(u32 size, u32 start) { }

static inline void omap_vram_set_sram_vram(u32 size, u32 start) { }



static inline void omap_vram_reserve_sdram(void) { }

static inline unsigned long omap_vram_reserve_sram(unsigned long sram_pstart,

					    unsigned long sram_vstart,

					    unsigned long sram_size,

					    unsigned long pstart_avail,

					    unsigned long size_avail)

{

	return 0;

}

#endif



#endif

arch/arm/plat-omap/sram.c

+8 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <plat/sram.h>

#include <plat/board.h>

#include <plat/cpu.h>

#include <plat/vram.h>



#include <plat/control.h>
@@ -185,6 +186,13 @@ void __init omap_detect_sram(void) 
				       omap_sram_start + SRAM_BOOTLOADER_SZ,

				       omap_sram_size - SRAM_BOOTLOADER_SZ);

	omap_sram_size -= reserved;



	reserved = omap_vram_reserve_sram(omap_sram_start, omap_sram_base,

			omap_sram_size,

			omap_sram_start + SRAM_BOOTLOADER_SZ,

			omap_sram_size - SRAM_BOOTLOADER_SZ);

	omap_sram_size -= reserved;



	omap_sram_ceil = omap_sram_base + omap_sram_size;

}

drivers/video/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2164,6 +2164,7 @@ config FB_BROADSHEET 
	  a bridge adapter.



source "drivers/video/omap/Kconfig"

source "drivers/video/omap2/Kconfig"



source "drivers/video/backlight/Kconfig"

source "drivers/video/display/Kconfig"

drivers/video/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ obj-$(CONFIG_FB_SM501) += sm501fb.o 
obj-$(CONFIG_FB_XILINX)           += xilinxfb.o

obj-$(CONFIG_FB_SH_MOBILE_LCDC)	  += sh_mobile_lcdcfb.o

obj-$(CONFIG_FB_OMAP)             += omap/

obj-y                             += omap2/

obj-$(CONFIG_XEN_FBDEV_FRONTEND)  += xen-fbfront.o

obj-$(CONFIG_FB_CARMINE)          += carminefb.o

obj-$(CONFIG_FB_MB862XX)	  += mb862xx/