asm/vga.h (was: Re: drm: Add support for platform devices to register as DRM devices)

asm/vga.h (was: Re: drm: Add support for platform devices to register as DRM devices)

[Geert Uytterhoeven]

On Fri, Aug 6, 2010 at 01:59, Linux Kernel Mailing List
<linux-kernel@vger.kernel.org> wrote:
> Gitweb:     http://git.kernel.org/linus/dcdb167402cbdca1d021bdfa5f63995ee0a79317
> Commit:     dcdb167402cbdca1d021bdfa5f63995ee0a79317
> Parent:     01d73a6967f12fe6c4bbde1834a9fe662264a2eb
> Author:     Jordan Crouse <jcrouse@codeaurora.org>
> AuthorDate: Thu May 27 13:40:25 2010 -0600
> Committer:  Dave Airlie <airlied@redhat.com>
> CommitDate: Tue Jun 1 10:07:39 2010 +1000
>
>    drm: Add support for platform devices to register as DRM devices

> --- a/drivers/gpu/drm/Kconfig
> +++ b/drivers/gpu/drm/Kconfig
> @@ -6,7 +6,7 @@
>  #
>  menuconfig DRM
>        tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
> -       depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG && MMU
> +       depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && MMU

Since this change, I can enable DRM on m68k, but it fails with:

| In file included from drivers/gpu/drm/drm_irq.c:42:
| include/linux/vgaarb.h:34:21: error: asm/vga.h: No such file or directory

Now, do we really need <asm/vga.h>? It seems I can make it build and boot using:

--- a/include/linux/vgaarb.h
+++ b/include/linux/vgaarb.h
@@ -31,7 +31,9 @@
 #ifndef LINUX_VGA_H
 #define LINUX_VGA_H

+#ifdef CONFIG_VGA_ARB
 #include <asm/vga.h>
+#endif

 /* Legacy VGA regions */
 #define VGA_RSRC_NONE         0x00

Alternatively, I can provide an empty <asm/vga.h> (cfr. frv, mn10300,
parisc, sh)
or a simple (probably incorrect) one that includes <asm-generic/vga.h>
(cfr. microblaze).
But so far we never needed <asm/vga.h> on m68k.

For the record, this "problem" has been visible in linux-next (see
m68k/allmodconfig)
since July 9...

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: asm/vga.h (was: Re: drm: Add support for platform devices to register as DRM devices)

[Adam Jackson]

[-- Attachment #1: Type: text/plain, Size: 453 bytes --]

On Tue, 2010-08-10 at 22:35 +0200, Geert Uytterhoeven wrote:

> Now, do we really need <asm/vga.h>? It seems I can make it build and boot using:
> 
> --- a/include/linux/vgaarb.h
> +++ b/include/linux/vgaarb.h
> @@ -31,7 +31,9 @@
>  #ifndef LINUX_VGA_H
>  #define LINUX_VGA_H
> 
> +#ifdef CONFIG_VGA_ARB
>  #include <asm/vga.h>
> +#endif
> 
>  /* Legacy VGA regions */
>  #define VGA_RSRC_NONE         0x00

That seems fine.

- ajax

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: asm/vga.h (was: Re: drm: Add support for platform devices to register as DRM devices)

[Dave Airlie]

On Tue, 2010-08-10 at 17:51 -0400, Adam Jackson wrote:
> On Tue, 2010-08-10 at 22:35 +0200, Geert Uytterhoeven wrote:
> 
> > Now, do we really need <asm/vga.h>? It seems I can make it build and boot using:
> > 

I think we can drop asm/vga.h on all platforms, I'll queue a patch up
for drm-next to see if we hit any problems, it works on x86 at least.

Dave.

> > --- a/include/linux/vgaarb.h
> > +++ b/include/linux/vgaarb.h
> > @@ -31,7 +31,9 @@
> >  #ifndef LINUX_VGA_H
> >  #define LINUX_VGA_H
> > 
> > +#ifdef CONFIG_VGA_ARB
> >  #include <asm/vga.h>
> > +#endif
> > 
> >  /* Legacy VGA regions */
> >  #define VGA_RSRC_NONE         0x00
> 
> That seems fine.
> 
> - ajax
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel