x86: allow fbdev primary video code on 64-bit.
Subsystems (2)
PATCH 1/1 x86: allow fbdev primary video code on 64-bit.
From: Dave Airlie <[email protected]>
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.
--- arch/x86/Makefile | 2 -- arch/x86/include/asm/fb.h | 4 ---- 2 files changed, 0 insertions(+), 6 deletions(-)
arch/x86/Makefile +0 -2
@@ -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
arch/x86/include/asm/fb.h +0 -4
@@ -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 */
Signature · 1 line
1.6.5.2
H. Peter Anvin
reviewerQuoted 9 lines · Dave Airlie
From: Dave Airlie <[email protected]>
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 <[email protected]>
Looks good... I presume this is for .34, though?
-hpa
Quoted 6 lines · H. Peter Anvin
Quoted 5 lines · Dave Airlie
From: Dave Airlie <[email protected]>
For some reason the 64-bit tree was doing this differently and I can't see why it would need to.
Quoted 6 lines
Quoted 4 lines
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 <[email protected]>Looks good... I presume this is for .34, though?
I don't mind, I'll be putting it into Fedora kernel anyways since its a real bug when the console turns up different on the same machine with 32 vs 64-bit kernels.
I can't see it having any side effects, not many ppl run two fbs on x86 anyways yet.
Dave.
Quoted 6 lines · H. Peter Anvin
Quoted 5 lines · Dave Airlie
From: Dave Airlie <[email protected]>
For some reason the 64-bit tree was doing this differently and I can't see why it would need to.
Quoted 6 lines
Quoted 4 lines
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 <[email protected]>Looks good... I presume this is for .34, though?
Is this queued? I've been told its not showing up in linux-next.
Dave.
H. Peter Anvin
reviewerQuoted 9 lines · Dave Airlie
From: Dave Airlie <[email protected]>
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 <[email protected]>
Looks good... I presume this is for .34, though?
-hpa
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
[tip:x86/gpu] x86-64: Allow fbdev primary video code
In reply to Dave AirlieCommit-ID: 477346ff74f4c2aed50e8a0db96a61069f3e5b80 Gitweb: http://git.kernel.org/tip/477346ff74f4c2aed50e8a0db96a61069f3e5b80 Author: Dave Airlie <[email protected]> AuthorDate: Thu, 7 Jan 2010 17:04:54 +1000 Committer: H. Peter Anvin <[email protected]> CommitDate: Tue, 16 Feb 2010 21:22:26 -0800
x86-64: Allow fbdev primary video code
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.
LKML-Reference: <[email protected]>
--- arch/x86/Makefile | 2 -- arch/x86/include/asm/fb.h | 4 ---- 2 files changed, 0 insertions(+), 6 deletions(-)
arch/x86/Makefile +0 -2
@@ -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
arch/x86/include/asm/fb.h +0 -4
@@ -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 */