rpms/kernel/F-12 linux-2.6-x86-64-fbdev-primary.patch, NONE, 1.1 kernel.spec, 1.1978, 1.1979

[Dave Airlie]

Author: airlied

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-64-fbdev-primary.patch 
Log Message:
* Wed Jan 13 2010 Dave Airlie <airlied at redhat.com> 2.6.32.3-19
- update dracut requires to make sure we get -ati firmware
- add fbdev multi-card console fix patch


linux-2.6-x86-64-fbdev-primary.patch:
 Makefile         |    2 --
 include/asm/fb.h |    5 -----
 2 files changed, 7 deletions(-)

--- NEW FILE linux-2.6-x86-64-fbdev-primary.patch ---
>From cdd54d73203838f249291988d5f79e40fee00a05 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Thu, 7 Jan 2010 16:59:06 +1000
Subject: [PATCH] x86: allow fbdev primary video code on 64-bit.

For some reason the 64-bit tree was doing this differently and
I can't see why it would need to.

This correct behaviour when you have two GPUs plugged in and
32-bit put the console in one place and 64-bit in another.

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 arch/x86/Makefile         |    2 --
 arch/x86/include/asm/fb.h |    4 ----
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 78b32be..0a43dc5 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -135,9 +135,7 @@ drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/
 # suspend and hibernation support
 drivers-$(CONFIG_PM) += arch/x86/power/
 
-ifeq ($(CONFIG_X86_32),y)
 drivers-$(CONFIG_FB) += arch/x86/video/
-endif
 
 ####
 # boot loader support. Several targets are kept for legacy purposes
diff --git a/arch/x86/include/asm/fb.h b/arch/x86/include/asm/fb.h
index 5301846..2519d06 100644
--- a/arch/x86/include/asm/fb.h
+++ b/arch/x86/include/asm/fb.h
@@ -12,10 +12,6 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
 		pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
 }
 
-#ifdef CONFIG_X86_32
 extern int fb_is_primary_device(struct fb_info *info);
-#else
-static inline int fb_is_primary_device(struct fb_info *info) { return 0; }
-#endif
 
 #endif /* _ASM_X86_FB_H */
-- 
1.6.5.2



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1978
retrieving revision 1.1979
diff -u -p -r1.1978 -r1.1979
--- kernel.spec	12 Jan 2010 17:04:16 -0000	1.1978
+++ kernel.spec	13 Jan 2010 03:12:45 -0000	1.1979
@@ -447,7 +447,7 @@ Summary: The Linux kernel
 #
 %define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, grubby >= 7.0.4-1
 %if %{with_dracut}
-%define initrd_prereq  dracut >= 001-7
+%define initrd_prereq  dracut >= 003-2
 %else
 %define initrd_prereq  mkinitrd >= 6.0.61-1
 %endif
@@ -685,6 +685,8 @@ Patch1520: crystalhd-2.6.34-staging.patc
 Patch1551: linux-2.6-ksm-kvm.patch
 Patch1552: linux-2.6-userspace_kvmclock_offset.patch
 
+# fbdev multi-card fix
+Patch1700: linux-2.6-x86-64-fbdev-primary.patch
 # nouveau + drm fixes
 Patch1810: drm-upgrayedd.patch
 #Patch1811: drm-radeon-fixes.patch
@@ -1327,6 +1329,7 @@ ApplyPatch linux-2.6-userspace_kvmclock_
 
 ApplyPatch linux-2.6-e1000-ich9.patch
 
+ApplyPatch linux-2.6-x86-64-fbdev-primary.patch
 # Nouveau DRM + drm fixes
 ApplyPatch drm-upgrayedd.patch
 #ApplyPatch drm-intel-big-hammer.patch
@@ -2015,6 +2018,10 @@ fi
 # and build.
 
 %changelog
+* Wed Jan 13 2010 Dave Airlie <airlied at redhat.com> 2.6.32.3-19
+- update dracut requires to make sure we get -ati firmware
+- add fbdev multi-card console fix patch
+
 * Tue Jan 12 2010 Jarod Wilson <jarod at redhat.com> 2.6.32.3-18
 - Add Broadcom Crystal HD driver from staging