2010-01-07 07:08:11

by Dave Airlie

Subject: [PATCH] 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.

Signed-off-by: Dave Airlie <[email protected]>
---
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

2010-01-07 23:06:58

by H. Peter Anvin

Subject: Re: [PATCH] x86: allow fbdev primary video code on 64-bit.

On 01/06/2010 11:04 PM, Dave Airlie wrote:
> 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

2010-01-07 23:18:23

by David Airlie

Subject: Re: [PATCH] x86: allow fbdev primary video code on 64-bit.

On Thu, 2010-01-07 at 15:06 -0800, H. Peter Anvin wrote:
> On 01/06/2010 11:04 PM, Dave Airlie wrote:
> > 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?

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.

2010-02-17 01:50:17

by Dave Airlie

Subject: Re: [PATCH] x86: allow fbdev primary video code on 64-bit.

On Fri, Jan 8, 2010 at 9:06 AM, H. Peter Anvin <[email protected]> wrote:
> On 01/06/2010 11:04 PM, Dave Airlie wrote:
>> 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?

Is this queued? I've been told its not showing up in linux-next.

Dave.

2010-02-17 05:34:22

by David Airlie

Subject: [tip:x86/gpu] x86-64: Allow fbdev primary video code

Commit-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.

Signed-off-by: Dave Airlie <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
---
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 */