From 41c557df98bb8f4b78265fc4fdafaa35b3c2e75e Mon Sep 17 00:00:00 2001
From: Dandawate Saket <dsaket@ti.com>
Date: Sat, 13 Apr 2013 11:45:09 -0700
Subject: [PATCH] OMAPDSS: OMAPLFB: Enable OMAPLFB for compilation

Fix compilation error and enable omaplfb.

Change-Id: Id641a0ece2f73f146bd843baa12d6092e4290027
Signed-off-by: Dandawate Saket <dsaket@ti.com>

Conflicts:
	arch/arm/configs/android_omap_defconfig
	drivers/video/omap2/omapfb/Kconfig
---
 arch/arm/configs/android_dra7_defconfig     | 1 +
 drivers/video/omap2/omapfb/Kconfig          | 2 +-
 drivers/video/omap2/omapfb/omapfb.h         | 2 +-
 drivers/video/omap2/omaplfb/omaplfb_linux.c | 2 +-
 include/linux/omapfb.h                      | 5 +++++
 5 files changed, 9 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 arch/arm/configs/android_dra7_defconfig

diff --git a/arch/arm/configs/android_dra7_defconfig b/arch/arm/configs/android_dra7_defconfig
old mode 100755
new mode 100644
index 14667612f35..f4330a11090
--- a/arch/arm/configs/android_dra7_defconfig
+++ b/arch/arm/configs/android_dra7_defconfig
@@ -200,6 +200,7 @@ CONFIG_OMAP2_DSS_RFBI=y
 CONFIG_OMAP2_DSS_SDI=y
 CONFIG_OMAP2_DSS_DSI=y
 CONFIG_FB_OMAP2=y
+CONFIG_OMAPLFB=y
 CONFIG_PANEL_GENERIC_DPI=y
 CONFIG_PANEL_TFP410=y
 CONFIG_PANEL_LGPHILIPS_LB035Q02=y
diff --git a/drivers/video/omap2/omapfb/Kconfig b/drivers/video/omap2/omapfb/Kconfig
index e612028980a..17cbb3f03e4 100644
--- a/drivers/video/omap2/omapfb/Kconfig
+++ b/drivers/video/omap2/omapfb/Kconfig
@@ -1,6 +1,6 @@
 menuconfig FB_OMAP2
         tristate "OMAP2+ frame buffer support"
-        depends on FB && OMAP2_DSS
+        depends on FB && OMAP2_DSS && !DRM_OMAP_DISPLAY
 
 	select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3
         select FB_CFB_FILLRECT
diff --git a/drivers/video/omap2/omapfb/omapfb.h b/drivers/video/omap2/omapfb/omapfb.h
index b41188d06e8..6e45f984563 100644
--- a/drivers/video/omap2/omapfb/omapfb.h
+++ b/drivers/video/omap2/omapfb/omapfb.h
@@ -30,7 +30,7 @@
 #include <linux/rwsem.h>
 #include <linux/dma-attrs.h>
 #include <linux/dma-mapping.h>
-
+#include <video/omapvrfb.h>
 #include <video/omapdss.h>
 
 #ifdef DEBUG
diff --git a/drivers/video/omap2/omaplfb/omaplfb_linux.c b/drivers/video/omap2/omaplfb/omaplfb_linux.c
index 7a5cd801314..7b674bdce1e 100644
--- a/drivers/video/omap2/omaplfb/omaplfb_linux.c
+++ b/drivers/video/omap2/omaplfb/omaplfb_linux.c
@@ -102,7 +102,7 @@ MODULE_SUPPORTED_DEVICE(DEVNAME);
 #if !defined(PVR_OMAPLFB_DRM_FB)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
 #define OMAP_DSS_DRIVER(drv, dev) struct omap_dss_driver *drv = (dev) != NULL ? (dev)->driver : NULL
-#define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->manager : NULL
+#define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->output->manager : NULL
 #define	WAIT_FOR_VSYNC(man)	((man)->wait_for_vsync)
 #else
 #define OMAP_DSS_DRIVER(drv, dev) struct omap_dss_device *drv = (dev)
diff --git a/include/linux/omapfb.h b/include/linux/omapfb.h
index e018d1cb4e8..5605c9b977b 100644
--- a/include/linux/omapfb.h
+++ b/include/linux/omapfb.h
@@ -65,4 +65,9 @@ extern void omapfb_set_platform_data(struct omapfb_platform_data *data);
 
 void __init omapfb_set_lcd_config(const struct omap_lcd_config *config);
 
+/* helper methods that may be used by other modules */
+enum omap_color_mode;
+int omapfb_mode_to_dss_mode(struct fb_var_screeninfo *var,
+                       enum omap_color_mode *mode);
+
 #endif /* __OMAPFB_H */
-- 
2.39.2