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

Merge branch '3.8/vram-conversion' of git://gitorious.org/linux-omap-dss2/linux 

Conflicts:
	drivers/video/omap2/dss/Kconfig
	drivers/video/omap2/omapfb/omapfb-ioctl.c
	drivers/video/omap2/omapfb/omapfb-main.c

Merge changes to make omapfb use common dma_alloc, and remove omap's
custom vram allocator.
parents 3c3dd225 966458f8

Documentation/arm/OMAP/DSS

+4 −6
Original line number Diff line number Diff line
@@ -285,7 +285,10 @@ FB0 +-- GFX ---- LCD ---- LCD 
Misc notes

----------



OMAP FB allocates the framebuffer memory using the OMAP VRAM allocator.

OMAP FB allocates the framebuffer memory using the standard dma allocator. You

can enable Contiguous Memory Allocator (CONFIG_CMA) to improve the dma

allocator, and if CMA is enabled, you use "cma=" kernel parameter to increase

the global memory area for CMA.



Using DSI DPLL to generate pixel clock it is possible produce the pixel clock

of 86.5MHz (max possible), and with that you get 1280x1024@57 output from DVI.
@@ -301,11 +304,6 @@ framebuffer parameters. 
Kernel boot arguments

---------------------



vram=<size>[,<physaddr>]

	- Amount of total VRAM to preallocate and optionally a physical start

	  memory address. For example, "10M". omapfb allocates memory for

	  framebuffers from VRAM.



omapfb.mode=<display>:<mode>[,...]

	- Default video mode for specified displays. For example,

	  "dvi:800x400MR-24@60".  See drivers/video/modedb.c.

arch/arm/mach-omap2/board-rx51-video.c

+0 −14
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/mm.h>

#include <asm/mach-types.h>

#include <video/omapdss.h>

#include <plat/vram.h>

#include <linux/platform_data/spi-omap2-mcspi.h>



#include "board-rx51.h"
@@ -87,17 +86,4 @@ static int __init rx51_video_init(void) 
}



subsys_initcall(rx51_video_init);



void __init rx51_video_mem_init(void)

{

	/*

	 * GFX 864x480x32bpp

	 * VID1/2 1280x720x32bpp double buffered

	 */

	omap_vram_set_sdram_vram(PAGE_ALIGN(864 * 480 * 4) +

			2 * PAGE_ALIGN(1280 * 720 * 4 * 2), 0);

}



#else

void __init rx51_video_mem_init(void) { }

#endif /* defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE) */

arch/arm/mach-omap2/board-rx51.c

+0 −3
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ 


#define RX51_GPIO_SLEEP_IND 162



extern void rx51_video_mem_init(void);



static struct gpio_led gpio_leds[] = {

	{

		.name	= "sleep_ind",
@@ -112,7 +110,6 @@ static void __init rx51_init(void) 


static void __init rx51_reserve(void)

{

	rx51_video_mem_init();

	omap_reserve();

}

arch/arm/plat-omap/common.c

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/dma-mapping.h>



#include <plat/common.h>

#include <plat/vram.h>

#include <linux/platform_data/dsp-omap.h>

#include <plat/dma.h>
@@ -25,7 +24,6 @@ 


void __init omap_reserve(void)

{

	omap_vram_reserve_sdram_memblock();

	omap_dsp_reserve_sdram_memblock();

	omap_secure_ram_reserve_memblock();

	omap_barrier_reserve_memblock();

arch/arm/plat-omap/fb.c

+3 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/memblock.h>

#include <linux/io.h>

#include <linux/omapfb.h>

#include <linux/dma-mapping.h>



#include <mach/hardware.h>

#include <asm/mach/map.h>
@@ -106,7 +107,7 @@ static struct platform_device omap_fb_device = { 
	.id		= -1,

	.dev = {

		.dma_mask		= &omap_fb_dma_mask,

		.coherent_dma_mask	= ~(u32)0,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &omapfb_config,

	},

	.num_resources = 0,
@@ -142,7 +143,7 @@ static struct platform_device omap_fb_device = { 
	.id		= -1,

	.dev = {

		.dma_mask		= &omap_fb_dma_mask,

		.coherent_dma_mask	= ~(u32)0,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &omapfb_config,

	},

	.num_resources = 0,