rpms/kernel/F-12 kms-offb-handoff.patch, 1.2, 1.3 kernel.spec, 1.1981, 1.1982

[Dave Airlie]

Author: airlied

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

Modified Files:
	kernel.spec 
Added Files:
	kms-offb-handoff.patch 
Log Message:
* Wed Jan 13 2010 Dave Airlie <airlied at redhat.com> 2.6.32.3-22
- bring back offb handoff patch - fixes G5 + nouveau


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

Index: kms-offb-handoff.patch
===================================================================
RCS file: kms-offb-handoff.patch
diff -N kms-offb-handoff.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ kms-offb-handoff.patch	13 Jan 2010 04:34:44 -0000	1.3
@@ -0,0 +1,54 @@
+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.1981
retrieving revision 1.1982
diff -u -p -r1.1981 -r1.1982
--- kernel.spec	13 Jan 2010 03:26:19 -0000	1.1981
+++ kernel.spec	13 Jan 2010 04:34:44 -0000	1.1982
@@ -687,6 +687,8 @@ Patch1552: linux-2.6-userspace_kvmclock_
 
 # fbdev multi-card fix
 Patch1700: linux-2.6-x86-64-fbdev-primary.patch
+Patch1701: kms-offb-handoff.patch
+
 # nouveau + drm fixes
 Patch1810: drm-upgrayedd.patch
 Patch1811: drm-radeon-fix-hang-on-suspend.patch
@@ -1329,6 +1331,7 @@ ApplyPatch linux-2.6-userspace_kvmclock_
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 ApplyPatch linux-2.6-x86-64-fbdev-primary.patch
+ApplyPatch kms-offb-handoff.patch
 # Nouveau DRM + drm fixes
 ApplyPatch drm-upgrayedd.patch
 ApplyPatch drm-radeon-fix-hang-on-suspend.patch
@@ -2018,6 +2021,9 @@ fi
 # and build.
 
 %changelog
+* Wed Jan 13 2010 Dave Airlie <airlied at redhat.com> 2.6.32.3-22
+- bring back offb handoff patch - fixes G5 + nouveau
+
 * Wed Jan 13 2010 Dave Airlie <airlied at redhat.com> 2.6.32.3-21
 - fix regression in radeon s/r - hangs on suspend