rpms/kernel/F-12 kms-offb-handoff.patch, NONE, 1.1 kernel.spec, 1.1886, 1.1887

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9955

Modified Files:
	kernel.spec 
Added Files:
	kms-offb-handoff.patch 
Log Message:
* Tue Oct 27 2009 Dave Airlie <airlied at redhat.com>
- kms: add offb handoff patch for ppc to work


kms-offb-handoff.patch:
 offb.c |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

--- NEW FILE kms-offb-handoff.patch ---
>From 4cd832e342436e1c89e34debf7ff72387ed9ce2f Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at ppcg5.localdomain>
Date: Tue, 22 Sep 2009 11:07:57 +1000
Subject: [PATCH] offb: add support for framebuffer handoff to offb.

This allows offb to be used for initial framebuffer,
and a kms driver to take over later in the boot sequence.

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 drivers/video/offb.c |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index 4d8c54c..b043ac8 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -282,8 +282,17 @@ static int offb_set_par(struct fb_info *info)
 	return 0;
 }
 
+static void offb_destroy(struct fb_info *info)
+{
+	if (info->screen_base)
+		iounmap(info->screen_base);
+	release_mem_region(info->aperture_base, info->aperture_size);
+	framebuffer_release(info);
+}
+
 static struct fb_ops offb_ops = {
 	.owner		= THIS_MODULE,
+	.fb_destroy	= offb_destroy,
 	.fb_setcolreg	= offb_setcolreg,
 	.fb_set_par	= offb_set_par,
 	.fb_blank	= offb_blank,
@@ -482,10 +491,14 @@ static void __init offb_init_fb(const char *name, const char *full_name,
 	var->sync = 0;
 	var->vmode = FB_VMODE_NONINTERLACED;
 
+	/* set offb aperture size for generic probing */
+	info->aperture_base = address;
+	info->aperture_size = fix->smem_len;
+
 	info->fbops = &offb_ops;
 	info->screen_base = ioremap(address, fix->smem_len);
 	info->pseudo_palette = (void *) (info + 1);
-	info->flags = FBINFO_DEFAULT | foreign_endian;
+	info->flags = FBINFO_DEFAULT | FBINFO_MISC_FIRMWARE | foreign_endian;
 
 	fb_alloc_cmap(&info->cmap, 256, 0);
 
-- 
1.6.5.rc2



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1886
retrieving revision 1.1887
diff -u -p -r1.1886 -r1.1887
--- kernel.spec	27 Oct 2009 07:54:46 -0000	1.1886
+++ kernel.spec	27 Oct 2009 10:27:30 -0000	1.1887
@@ -686,6 +686,7 @@ Patch1585: linux-2.6-xen-increase-device
 Patch1586: linux-2.6-virtio_blk-add-support-for-cache-flush.patch
 
 # nouveau + drm fixes
+Patch1810: kms-offb-handoff.patch
 Patch1812: drm-next-3e5cb98d.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
@@ -1373,6 +1374,7 @@ ApplyPatch linux-2.6-block-silently-erro
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
+ApplyPatch kms-offb-handoff.patch
 ApplyPatch drm-next-3e5cb98d.patch
 
 ApplyPatch drm-nouveau.patch
@@ -2092,6 +2094,9 @@ fi
 # and build.
 
 %changelog
+* Tue Oct 27 2009 Dave Airlie <airlied at redhat.com>
+- kms: add offb handoff patch for ppc to work
+
 * Tue Oct 27 2009 Ben Skeggs <bskeggs at redhat.com>
 - drm-nouveau.patch: misc fixes, very initial NVA8 work