[oe-commits] Koen Kooi : linux-omap 2.6.27: make SGX drivers build

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: a61d3745d51ff8b2c7c8b307bfccea031cf99e30
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a61d3745d51ff8b2c7c8b307bfccea031cf99e30

Author: Koen Kooi <koen at openembedded.org>
Date:   Tue Dec  9 15:34:30 2008 +0100

linux-omap 2.6.27: make SGX drivers build

---

 packages/linux/linux-omap-2.6.27/pvr/dispc.patch   |   46 ++++++++++++++++++++
 packages/linux/linux-omap-2.6.27/pvr/pvr-add.patch |    5 ++
 packages/linux/linux-omap_2.6.27.bb                |    3 +-
 3 files changed, 53 insertions(+), 1 deletions(-)

diff --git a/packages/linux/linux-omap-2.6.27/pvr/dispc.patch b/packages/linux/linux-omap-2.6.27/pvr/dispc.patch
new file mode 100644
index 0000000..1697448
--- /dev/null
+++ b/packages/linux/linux-omap-2.6.27/pvr/dispc.patch
@@ -0,0 +1,46 @@
+--- kernel-2.6.27.orig/drivers/video/omap/dispc.c
++++ kernel-2.6.27/drivers/video/omap/dispc.c
+@@ -314,6 +319,32 @@
+ }
+ EXPORT_SYMBOL(omap_dispc_enable_digit_out);
+ 
++extern void omap_dispc_set_plane_base(int plane, u32 paddr)
++{
++	u32 reg;
++	u32 val;
++
++	switch (plane) {
++	case 0:
++		reg = DISPC_GFX_BA0;
++		break;
++	case 1:
++		reg = DISPC_VID1_BASE + DISPC_VID_BA0;
++		break;
++	case 2:
++		reg = DISPC_VID2_BASE + DISPC_VID_BA0;
++		break;
++	default:
++		BUG();
++		return;
++	}
++
++	dispc_write_reg(reg, paddr);
++	val = dispc_read_reg(DISPC_CONTROL) | (1 << 5); /* GOLCD */
++	dispc_write_reg(DISPC_CONTROL, val);
++}
++EXPORT_SYMBOL(omap_dispc_set_plane_base);
++
+ static inline int _setup_plane(int plane, int channel_out,
+ 				  u32 paddr, int screen_width,
+ 				  int pos_x, int pos_y, int width, int height,
+--- /tmp/dispc.h	2008-12-09 15:13:12.000000000 +0100
++++ git/drivers/video/omap/dispc.h	2008-12-09 15:13:36.000000000 +0100
+@@ -32,6 +32,8 @@
+ #define DISPC_TFT_DATA_LINES_18		2
+ #define DISPC_TFT_DATA_LINES_24		3
+ 
++extern void omap_dispc_set_plane_base(int plane, u32 paddr);
++
+ extern void omap_dispc_set_lcd_size(int width, int height);
+ 
+ extern void omap_dispc_enable_lcd_out(int enable);
diff --git a/packages/linux/linux-omap-2.6.27/pvr/pvr-add.patch b/packages/linux/linux-omap-2.6.27/pvr/pvr-add.patch
index 9ff89fe..541e869 100644
--- a/packages/linux/linux-omap-2.6.27/pvr/pvr-add.patch
+++ b/packages/linux/linux-omap-2.6.27/pvr/pvr-add.patch
@@ -155092,3 +155092,8 @@ diff -Nurd git/drivers/gpu/pvr/services4/system/omap3430/sysutils.c git-nokia/dr
 +#error "Disabling of OMAP graphics clock not supported for this environment"
 +#endif 
 +}
+--- /tmp/Makefile	2008-12-09 15:25:43.000000000 +0100
++++ git/drivers/gpu/Makefile	2008-12-09 15:25:53.000000000 +0100
+@@ -1 +1 @@
+-obj-y			+= drm/
++obj-y			+= drm-tungsten/ pvr/
diff --git a/packages/linux/linux-omap_2.6.27.bb b/packages/linux/linux-omap_2.6.27.bb
index cacdb5e..8173d56 100644
--- a/packages/linux/linux-omap_2.6.27.bb
+++ b/packages/linux/linux-omap_2.6.27.bb
@@ -6,7 +6,7 @@ KERNEL_IMAGETYPE = "uImage"
 COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm"
 
 SRCREV = "2a3408be17f287fdb5809c9b6c68e7ad96d25b74"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
@@ -38,6 +38,7 @@ SRC_URI_append = " \
 #           file://openvz/0004-arm-add-openvz-and-bc-Kconfigs.patch;patch=1 \
 #           file://openvz/openvz-2.6.27.diff;patch=1 \
            file://pvr/pvr-add.patch;patch=1 \
+           file://pvr/dispc.patch;patch=1 \
 "