[oe-commits] Martin Jansa : linux-openmoko-2.6.32: add 2 new patches from gdrm-2.6. 32 branch

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Apr 14 12:21:28 2010 +0200

linux-openmoko-2.6.32: add 2 new patches from gdrm-2.6.32 branch

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 ...23-Re-enable-Glamo-fence-IRQ-if-it-sticks.patch |   36 ++++++++++++++++++
 ...0024-Fix-KMS-framebuffer-physical-address.patch |   38 ++++++++++++++++++++
 recipes/linux/linux-openmoko-2.6.32_git.bb         |    4 ++-
 3 files changed, 77 insertions(+), 1 deletions(-)

diff --git a/recipes/linux/linux-openmoko-2.6.32/0023-Re-enable-Glamo-fence-IRQ-if-it-sticks.patch b/recipes/linux/linux-openmoko-2.6.32/0023-Re-enable-Glamo-fence-IRQ-if-it-sticks.patch
new file mode 100644
index 0000000..a24350f
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.32/0023-Re-enable-Glamo-fence-IRQ-if-it-sticks.patch
@@ -0,0 +1,36 @@
+From 348d0334015689a22c9dbd8dd0291360c960a764 Mon Sep 17 00:00:00 2001
+From: Thomas White <taw at bitwiz.org.uk>
+Date: Tue, 13 Apr 2010 22:18:41 +0200
+Subject: [PATCH 23/24] Re-enable Glamo fence IRQ if it sticks
+
+Also fix a formatting typo.
+
+Signed-off-by: Thomas White <taw at bitwiz.org.uk>
+---
+ drivers/mfd/glamo/glamo-fence.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/mfd/glamo/glamo-fence.c b/drivers/mfd/glamo/glamo-fence.c
+index 9119675..ba3ed88 100644
+--- a/drivers/mfd/glamo/glamo-fence.c
++++ b/drivers/mfd/glamo/glamo-fence.c
+@@ -98,7 +98,7 @@ static void glamo_fence_emit(struct glamo_fence *fence)
+ 
+ static void glamo_fence_enable(struct glamodrm_handle *gdrm)
+ {
+-	enable_irq( GLAMO_IRQ_2D);
++	enable_irq(GLAMO_IRQ_2D);
+ }
+ 
+ 
+@@ -168,6 +168,7 @@ static void glamo_fence_debodge(struct glamodrm_handle *gdrm)
+ 
+ 	glamo_cmdq_wait(gdrm, GLAMO_ENGINE_ALL);
+ 	glamo_engine_reset(gdrm->glamo_core, GLAMO_ENGINE_2D);
++	glamo_fence_enable(gdrm);
+ 
+ 	read_lock(&gdrm->fence_list_lock);
+ 	list_for_each(tmp, &gdrm->fence_list) {
+-- 
+1.7.0.4
+
diff --git a/recipes/linux/linux-openmoko-2.6.32/0024-Fix-KMS-framebuffer-physical-address.patch b/recipes/linux/linux-openmoko-2.6.32/0024-Fix-KMS-framebuffer-physical-address.patch
new file mode 100644
index 0000000..3ce4d59
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.32/0024-Fix-KMS-framebuffer-physical-address.patch
@@ -0,0 +1,38 @@
+From 1b83b6d7f2e1bf5473cd17a742737a1cfe450509 Mon Sep 17 00:00:00 2001
+From: Thomas White <taw at bitwiz.org.uk>
+Date: Fri, 20 Nov 2009 22:06:30 +0100
+Subject: [PATCH 24/24] Fix KMS framebuffer physical address
+
+This allows "/dev/fb0" to work correctly with mmap().
+
+Signed-off-by: Thomas White <taw at bitwiz.org.uk>
+---
+ drivers/mfd/glamo/glamo-kms-fb.c |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/mfd/glamo/glamo-kms-fb.c b/drivers/mfd/glamo/glamo-kms-fb.c
+index 6d4b9ea..04de83b 100644
+--- a/drivers/mfd/glamo/glamo-kms-fb.c
++++ b/drivers/mfd/glamo/glamo-kms-fb.c
+@@ -387,9 +387,6 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width,
+ 	info->fbops = &glamofb_ops;
+ 
+ 	info->fix.line_length = fb->pitch;
+-	info->fix.smem_start = dev->mode_config.fb_base
+-	                        + (unsigned long) gdrm->vram->start;
+-	info->fix.smem_len = size;
+ 
+ 	info->flags = FBINFO_DEFAULT;
+ 
+@@ -401,6 +398,8 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width,
+ 		ret = -ENOSPC;
+ 		goto out_unref;
+ 	}
++	info->fix.smem_start = (unsigned long)gdrm->vram->start + offs;
++	info->fix.smem_len = size;
+ 	info->screen_size = size;
+ 
+ 	info->pseudo_palette = fb->pseudo_palette;
+-- 
+1.7.0.4
+
diff --git a/recipes/linux/linux-openmoko-2.6.32_git.bb b/recipes/linux/linux-openmoko-2.6.32_git.bb
index 11384c0..787ed2d 100644
--- a/recipes/linux/linux-openmoko-2.6.32_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.32_git.bb
@@ -8,7 +8,7 @@ KERNEL_RELEASE="2.6.32.11"
 SRCREV = "14be1091928fcce66812a85129768fb253b36420"
 OEV = "oe1"
 PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=om-gta02-2.6.32 \
@@ -39,6 +39,8 @@ SRC_URI = "\
   file://0020-save_regs.patch.patch;patch=1 \
   file://0021-gta02_defconfig.patch;patch=1 \
   file://0022-gta02_drm_defconfig.patch;patch=1 \
+  file://0023-Re-enable-Glamo-fence-IRQ-if-it-sticks.patch;patch=1 \
+  file://0024-Fix-KMS-framebuffer-physical-address.patch;patch=1 \
 "
 
 SRC_URI[stablepatch.md5sum] = "855c248334a71ef5ca3d8cb89d51334f"