rpms/kernel/devel linux-2.6-x86-64-fbdev-primary.patch, NONE, 1.1 TODO, 1.67, 1.68 kernel.spec, 1.1891, 1.1892 drm-i915-resume-force-mode.patch, 1.2, NONE drm-intel-no-tv-hotplug.patch, 1.2, NONE drm-intel-pm.patch, 1.5, NONE drm-next.patch, 1.19, NONE drm-nouveau.patch, 1.54, NONE drm-page-flip.patch, 1.8, NONE drm-radeon-dp-support.patch, 1.1, NONE drm-radeon-fix-crtc-vbl-update-for-r600.patch, 1.1, NONE drm-radeon-fixes.patch, 1.3, NONE drm-radeon-pm.patch, 1.2, NONE

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4723

Modified Files:
	TODO kernel.spec 
Added Files:
	linux-2.6-x86-64-fbdev-primary.patch 
Removed Files:
	drm-i915-resume-force-mode.patch drm-intel-no-tv-hotplug.patch 
	drm-intel-pm.patch drm-next.patch drm-nouveau.patch 
	drm-page-flip.patch drm-radeon-dp-support.patch 
	drm-radeon-fix-crtc-vbl-update-for-r600.patch 
	drm-radeon-fixes.patch drm-radeon-pm.patch 
Log Message:
* Wed Jan 13 2010 Dave Airlie <airlied at redhat.com>
- Add fbdev fix for multi-card primary console on x86-64
- clean up all the drm- patches


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: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/TODO,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- TODO	12 Oct 2009 20:44:19 -0000	1.67
+++ TODO	13 Jan 2010 02:56:55 -0000	1.68
@@ -2,14 +2,6 @@
 	Assorted fixes/improvements, especially to the ondemand governor.
 	Will go upstream in 2.6.28
 
-* drm-modesetting-radeon.patch
-	Radeon kernel mode-setting.
-	Won't go upstream for a while.
-
-* drm-nouveau.patch
-	Nouveau DRM driver.
-	Won't go upstream until ABI confirmed.
-
 * linux-2.6-ata-quirk.patch
 	IA64 oddness. Query sent to f-k-l
 
@@ -83,3 +75,6 @@
 
 * linux-2.6-kmemleak-improvements.patch
 	will go upstream for .31
+
+* linux-2.6-x86-64-fbdev-primary.patch
+	upstream for 2.6.34 - posted to lkml


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1891
retrieving revision 1.1892
diff -u -p -r1.1891 -r1.1892
--- kernel.spec	12 Jan 2010 21:14:28 -0000	1.1891
+++ kernel.spec	13 Jan 2010 02:56:57 -0000	1.1892
@@ -678,19 +678,14 @@ Patch1520: crystalhd-2.6.34-staging.patc
 Patch1551: linux-2.6-ksm-kvm.patch
 Patch1552: linux-2.6-userspace_kvmclock_offset.patch
 
+# fbdev x86-64 primary fix
+Patch1700: linux-2.6-x86-64-fbdev-primary.patch
+
 # nouveau + drm fixes
-Patch1811: drm-radeon-fixes.patch
-Patch1812: drm-radeon-dp-support.patch
-Patch1813: drm-radeon-pm.patch
-Patch1814: drm-nouveau.patch
 Patch1815: drm_nouveau_ucode.patch
-Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
-Patch1821: drm-page-flip.patch
 # intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
-Patch1825: drm-intel-pm.patch
-Patch1828: drm-radeon-fix-crtc-vbl-update-for-r600.patch
 
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
@@ -1291,21 +1286,15 @@ ApplyPatch crystalhd-2.6.34-staging.patc
 # Fix block I/O errors in KVM
 #ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 
+# fix x86-64 fbdev primary GPU selection
+ApplyPatch linux-2.6-x86-64-fbdev-primary.patch
+
 # Nouveau DRM + drm fixes
-#ApplyPatch drm-radeon-fixes.patch FIXME
-#ApplyPatch drm-radeon-dp-support.patch FIXME
-#ApplyPatch drm-nouveau.patch (upstream?)
 # squash nouveau firmware into a single commit until it gets into linux-firmware
 ApplyPatch drm_nouveau_ucode.patch
 # pm broken on my thinkpad t60p - airlied
-#ApplyPatch drm-radeon-pm.patch
-#ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
-#ApplyPatch drm-page-flip.patch
 ApplyOptionalPatch drm-intel-next.patch
-#this appears to be upstream - mjg59?
-#ApplyPatch drm-intel-pm.patch
-#ApplyPatch drm-radeon-fix-crtc-vbl-update-for-r600.patch
 
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1976,6 +1965,10 @@ fi
 # and build.
 
 %changelog
+* Wed Jan 13 2010 Dave Airlie <airlied at redhat.com>
+- Add fbdev fix for multi-card primary console on x86-64
+- clean up all the drm- patches
+
 * Tue Jan 12 2010 Jarod Wilson <jarod at redhat.com>
 - Update lirc patch for 2.6.33 kfifo changes
 - Add Broadcom Crystal HD video decoder driver from staging


--- drm-i915-resume-force-mode.patch DELETED ---


--- drm-intel-no-tv-hotplug.patch DELETED ---


--- drm-intel-pm.patch DELETED ---


--- drm-next.patch DELETED ---


--- drm-nouveau.patch DELETED ---


--- drm-page-flip.patch DELETED ---


--- drm-radeon-dp-support.patch DELETED ---


--- drm-radeon-fix-crtc-vbl-update-for-r600.patch DELETED ---


--- drm-radeon-fixes.patch DELETED ---


--- drm-radeon-pm.patch DELETED ---