From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Fri, 16 Nov 2012 09:42:46 +0000 (+0200)
Subject: Merge branch '3.8/vram-conversion' of git://gitorious.org/linux-omap-dss2/linux
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=dcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8;p=deliverable%2Flinux.git

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.
---

dcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8
diff --cc drivers/video/omap2/dss/Kconfig
index 50e880260d8c,058a669cb512..cb0f145c7077
--- a/drivers/video/omap2/dss/Kconfig
+++ b/drivers/video/omap2/dss/Kconfig
@@@ -5,34 -6,12 +5,22 @@@ menuconfig OMAP2_DS
  
  if OMAP2_DSS
  
- config OMAP2_VRAM_SIZE
- 	int "VRAM size (MB)"
- 	range 0 32
- 	default 0
- 	help
- 	  The amount of SDRAM to reserve at boot time for video RAM use.
- 	  This VRAM will be used by omapfb and other drivers that need
- 	  large continuous RAM area for video use.
- 
- 	  You can also set this with "vram=<bytes>" kernel argument, or
- 	  in the board file.
- 
 -config OMAP2_DSS_DEBUG_SUPPORT
 -        bool "Debug support"
 -	default y
 +config OMAP2_DSS_DEBUG
 +	bool "Debug support"
 +	default n
 +	help
 +	  This enables printing of debug messages. Alternatively, debug messages
 +	  can also be enabled by setting CONFIG_DYNAMIC_DEBUG and then setting
 +	  appropriate flags in <debugfs>/dynamic_debug/control.
 +
 +config OMAP2_DSS_DEBUGFS
 +	bool "Debugfs filesystem support"
 +	depends on DEBUG_FS
 +	default n
  	help
 -	  This enables debug messages. You need to enable printing
 -	  with 'debug' module parameter.
 +	  This enables debugfs for OMAPDSS at <debugfs>/omapdss. This enables
 +	  querying about clock configuration and register configuration of dss,
 +	  dispc, dsi, hdmi and rfbi.
  
  config OMAP2_DSS_COLLECT_IRQ_STATS
  	bool "Collect DSS IRQ statistics"
diff --cc drivers/video/omap2/omapfb/omapfb-ioctl.c
index 55a39be694a5,574c1708f749..3c73adbbf5f1
--- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
@@@ -30,8 -30,7 +30,7 @@@
  #include <linux/export.h>
  
  #include <video/omapdss.h>
 -#include <plat/vrfb.h>
 +#include <video/omapvrfb.h>
- #include <plat/vram.h>
  
  #include "omapfb.h"
  
diff --cc drivers/video/omap2/omapfb/omapfb-main.c
index be9096ced793,84c10121de48..408a3cce47ad
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@@ -31,8 -31,8 +31,7 @@@
  #include <linux/omapfb.h>
  
  #include <video/omapdss.h>
- #include <plat/vram.h>
 -#include <plat/cpu.h>
 -#include <plat/vrfb.h>
 +#include <video/omapvrfb.h>
  
  #include "omapfb.h"