drm/mgag200: fix build on alpha arch

Commit Message

Sam Ravnborg Aug. 7, 2020, 6:05 p.m. UTC

When building imgag200 for the alpha architecture it fails like this:
mgag200_drv.c:233:9: error: implicit declaration of function ‘vmalloc’
  233 |  bios = vmalloc(size);
      |         ^~~~~~~
      |         kmalloc

When building for other architectures vmalloc.h is pulled in via some
other header file - for example asm-generic/io.h.
Use an explicit include of vmalloc.h to fix the build.

Signed-off-by: Sam Ravnborg <[e-mail]>
Fixes: e20dfd27f7aa ("drm/mgag200: Add support for G200 desktop cards")
Cc: Thomas Zimmermann <[e-mail]>
Cc: Egbert Eich <[e-mail]>
Cc: Takashi Iwai <[e-mail]>
Cc: Lyude Paul <[e-mail]>
---
I have lost track if the offending commit is on the way to upstream or
it is just in drm-misc-next. But I think it is the latter so we can
apply this to drm-misc-next.

	Sam

 drivers/gpu/drm/mgag200/mgag200_drv.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Daniel Vetter Aug. 7, 2020, 8:36 p.m. UTC | #1

On Fri, Aug 7, 2020 at 8:05 PM Sam Ravnborg <[e-mail]> wrote:
>
> When building imgag200 for the alpha architecture it fails like this:
> mgag200_drv.c:233:9: error: implicit declaration of function ‘vmalloc’
>   233 |  bios = vmalloc(size);
>       |         ^~~~~~~
>       |         kmalloc
>
> When building for other architectures vmalloc.h is pulled in via some
> other header file - for example asm-generic/io.h.
> Use an explicit include of vmalloc.h to fix the build.
>
> Signed-off-by: Sam Ravnborg <[e-mail]>
> Fixes: e20dfd27f7aa ("drm/mgag200: Add support for G200 desktop cards")
> Cc: Thomas Zimmermann <[e-mail]>
> Cc: Egbert Eich <[e-mail]>
> Cc: Takashi Iwai <[e-mail]>
> Cc: Lyude Paul <[e-mail]>
> ---
> I have lost track if the offending commit is on the way to upstream or
> it is just in drm-misc-next. But I think it is the latter so we can
> apply this to drm-misc-next.

$ dim status # fetches all the trees
$ dim tag-contains e20dfd27f7aa
drm-misc/drm-misc-next

You guess correctly :-)

Reviewed-by: Daniel Vetter <[e-mail]>
>
>         Sam
>
>  drivers/gpu/drm/mgag200/mgag200_drv.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
> index 09170d46aa53..b282b0e42c2d 100644
> --- a/drivers/gpu/drm/mgag200/mgag200_drv.c
> +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
> @@ -9,6 +9,7 @@
>  #include <linux/console.h>
>  #include <linux/module.h>
>  #include <linux/pci.h>
> +#include <linux/vmalloc.h>
>
>  #include <drm/drm_drv.h>
>  #include <drm/drm_file.h>
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> [e-mail]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

Sam Ravnborg Aug. 7, 2020, 9 p.m. UTC | #2

Hi Daniel.

On Fri, Aug 07, 2020 at 10:36:34PM +0200, Daniel Vetter wrote:
> On Fri, Aug 7, 2020 at 8:05 PM Sam Ravnborg <[e-mail]> wrote:
> >
> > When building imgag200 for the alpha architecture it fails like this:
> > mgag200_drv.c:233:9: error: implicit declaration of function ‘vmalloc’
> >   233 |  bios = vmalloc(size);
> >       |         ^~~~~~~
> >       |         kmalloc
> >
> > When building for other architectures vmalloc.h is pulled in via some
> > other header file - for example asm-generic/io.h.
> > Use an explicit include of vmalloc.h to fix the build.
> >
> > Signed-off-by: Sam Ravnborg <[e-mail]>
> > Fixes: e20dfd27f7aa ("drm/mgag200: Add support for G200 desktop cards")
> > Cc: Thomas Zimmermann <[e-mail]>
> > Cc: Egbert Eich <[e-mail]>
> > Cc: Takashi Iwai <[e-mail]>
> > Cc: Lyude Paul <[e-mail]>
> > ---
> > I have lost track if the offending commit is on the way to upstream or
> > it is just in drm-misc-next. But I think it is the latter so we can
> > apply this to drm-misc-next.
> 
> $ dim status # fetches all the trees
Hmm, except that it did not update drm-misc-next?!?

I have read "Commiters that want to check the status of their
current branch should use normal git status commands."

So that, I guess, may explain it.

> $ dim tag-contains e20dfd27f7aa
> drm-misc/drm-misc-next
Nice little command - but no "tag-contains" in my dim version.
There is "dim tc" but no-one have any chance guessing what tc
is an abbrevation for - sigh.

> 
> You guess correctly :-)
> 
> Reviewed-by: Daniel Vetter <[e-mail]>

Thanks, pushed to drm-misc-next.

	Sam


> >
> >         Sam
> >
> >  drivers/gpu/drm/mgag200/mgag200_drv.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
> > index 09170d46aa53..b282b0e42c2d 100644
> > --- a/drivers/gpu/drm/mgag200/mgag200_drv.c
> > +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
> > @@ -9,6 +9,7 @@
> >  #include <linux/console.h>
> >  #include <linux/module.h>
> >  #include <linux/pci.h>
> > +#include <linux/vmalloc.h>
> >
> >  #include <drm/drm_drv.h>
> >  #include <drm/drm_file.h>
> > --
> > 2.25.1
> >
> > _______________________________________________
> > dri-devel mailing list
> > [e-mail]
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> 
> 
> 
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
> _______________________________________________
> dri-devel mailing list
> [e-mail]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

Thomas Zimmermann Aug. 11, 2020, 6:59 a.m. UTC | #3

Hi Sam

thanks for taken care of this issue. Alpha is a rare architecture these
days. How do you build and test for it?

Am 07.08.20 um 20:05 schrieb Sam Ravnborg:
> When building imgag200 for the alpha architecture it fails like this:
> mgag200_drv.c:233:9: error: implicit declaration of function ‘vmalloc’
>   233 |  bios = vmalloc(size);
>       |         ^~~~~~~
>       |         kmalloc
> 
> When building for other architectures vmalloc.h is pulled in via some
> other header file - for example asm-generic/io.h.
> Use an explicit include of vmalloc.h to fix the build.
> 
> Signed-off-by: Sam Ravnborg <[e-mail]>

Sorry for being (too) late, but still:

Reviewed-by: Thomas Zimmermann <[e-mail]>

Best regards
Thomas

> Fixes: e20dfd27f7aa ("drm/mgag200: Add support for G200 desktop cards")
> Cc: Thomas Zimmermann <[e-mail]>
> Cc: Egbert Eich <[e-mail]>
> Cc: Takashi Iwai <[e-mail]>
> Cc: Lyude Paul <[e-mail]>
> ---
> I have lost track if the offending commit is on the way to upstream or
> it is just in drm-misc-next. But I think it is the latter so we can
> apply this to drm-misc-next.
> 
> 	Sam
> 
>  drivers/gpu/drm/mgag200/mgag200_drv.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
> index 09170d46aa53..b282b0e42c2d 100644
> --- a/drivers/gpu/drm/mgag200/mgag200_drv.c
> +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
> @@ -9,6 +9,7 @@
>  #include <linux/console.h>
>  #include <linux/module.h>
>  #include <linux/pci.h>
> +#include <linux/vmalloc.h>
>  
>  #include <drm/drm_drv.h>
>  #include <drm/drm_file.h>
>

Sam Ravnborg Aug. 11, 2020, 8:12 a.m. UTC | #4

Hi Thomas.

On Tue, Aug 11, 2020 at 08:59:13AM +0200, Thomas Zimmermann wrote:
> Hi Sam
> 
> thanks for taken care of this issue. Alpha is a rare architecture these
> days. How do you build and test for it?

I am on ubuntu here so I have installed:
apt install gcc-alpha-linux-gnu

And then alpha is one of the architectures I build for.
My full list:
archs="alpha arm arm64 sparc64 i386 x86 powerpc s390 riscv sh"

I build these configs:
configs="allmodconfig allyesconfig allnoconfig defconfig"

It takes a while so usually I build only the relevant sub-set such as
drivers/gpu/drm/bridge/

I have, unfortunately, no testing. Would love something qemu based but
have never invested time into this.

	Sam

> 
> Am 07.08.20 um 20:05 schrieb Sam Ravnborg:
> > When building imgag200 for the alpha architecture it fails like this:
> > mgag200_drv.c:233:9: error: implicit declaration of function ‘vmalloc’
> >   233 |  bios = vmalloc(size);
> >       |         ^~~~~~~
> >       |         kmalloc
> > 
> > When building for other architectures vmalloc.h is pulled in via some
> > other header file - for example asm-generic/io.h.
> > Use an explicit include of vmalloc.h to fix the build.
> > 
> > Signed-off-by: Sam Ravnborg <[e-mail]>
> 
> Sorry for being (too) late, but still:
> 
> Reviewed-by: Thomas Zimmermann <[e-mail]>
> 
> Best regards
> Thomas
> 
> > Fixes: e20dfd27f7aa ("drm/mgag200: Add support for G200 desktop cards")
> > Cc: Thomas Zimmermann <[e-mail]>
> > Cc: Egbert Eich <[e-mail]>
> > Cc: Takashi Iwai <[e-mail]>
> > Cc: Lyude Paul <[e-mail]>
> > ---
> > I have lost track if the offending commit is on the way to upstream or
> > it is just in drm-misc-next. But I think it is the latter so we can
> > apply this to drm-misc-next.
> > 
> > 	Sam
> > 
> >  drivers/gpu/drm/mgag200/mgag200_drv.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
> > index 09170d46aa53..b282b0e42c2d 100644
> > --- a/drivers/gpu/drm/mgag200/mgag200_drv.c
> > +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
> > @@ -9,6 +9,7 @@
> >  #include <linux/console.h>
> >  #include <linux/module.h>
> >  #include <linux/pci.h>
> > +#include <linux/vmalloc.h>
> >  
> >  #include <drm/drm_drv.h>
> >  #include <drm/drm_file.h>
> > 
> 
> -- 
> Thomas Zimmermann
> Graphics Driver Developer
> SUSE Software Solutions Germany GmbH
> Maxfeldstr. 5, 90409 Nürnberg, Germany
> (HRB 36809, AG Nürnberg)
> Geschäftsführer: Felix Imendörffer
>

Daniel Vetter Aug. 11, 2020, 8:55 a.m. UTC | #5

On Tue, Aug 11, 2020 at 10:12:01AM +0200, Sam Ravnborg wrote:
> Hi Thomas.
> 
> On Tue, Aug 11, 2020 at 08:59:13AM +0200, Thomas Zimmermann wrote:
> > Hi Sam
> > 
> > thanks for taken care of this issue. Alpha is a rare architecture these
> > days. How do you build and test for it?
> 
> I am on ubuntu here so I have installed:
> apt install gcc-alpha-linux-gnu
> 
> And then alpha is one of the architectures I build for.
> My full list:
> archs="alpha arm arm64 sparc64 i386 x86 powerpc s390 riscv sh"
> 
> I build these configs:
> configs="allmodconfig allyesconfig allnoconfig defconfig"
> 
> It takes a while so usually I build only the relevant sub-set such as
> drivers/gpu/drm/bridge/
> 
> I have, unfortunately, no testing. Would love something qemu based but
> have never invested time into this.

So the long term idea here was that we'd do at least all the build testing
on gitlab. But moving the drm repos over to gitlab has kinda been on hold
for a bit, with all the gitlab.freedesktop.org struggles past few months.
It does look like it's on a really good track though.

Then we could do build testing for pretty much any reasonable
architecture, and also qemu based runs (within reasons at least). And
committers wouldn't have to duplicate it all for their own setup, since
it's all shared.
-Daniel

> 
> 	Sam
> 
> > 
> > Am 07.08.20 um 20:05 schrieb Sam Ravnborg:
> > > When building imgag200 for the alpha architecture it fails like this:
> > > mgag200_drv.c:233:9: error: implicit declaration of function ‘vmalloc’
> > >   233 |  bios = vmalloc(size);
> > >       |         ^~~~~~~
> > >       |         kmalloc
> > > 
> > > When building for other architectures vmalloc.h is pulled in via some
> > > other header file - for example asm-generic/io.h.
> > > Use an explicit include of vmalloc.h to fix the build.
> > > 
> > > Signed-off-by: Sam Ravnborg <[e-mail]>
> > 
> > Sorry for being (too) late, but still:
> > 
> > Reviewed-by: Thomas Zimmermann <[e-mail]>
> > 
> > Best regards
> > Thomas
> > 
> > > Fixes: e20dfd27f7aa ("drm/mgag200: Add support for G200 desktop cards")
> > > Cc: Thomas Zimmermann <[e-mail]>
> > > Cc: Egbert Eich <[e-mail]>
> > > Cc: Takashi Iwai <[e-mail]>
> > > Cc: Lyude Paul <[e-mail]>
> > > ---
> > > I have lost track if the offending commit is on the way to upstream or
> > > it is just in drm-misc-next. But I think it is the latter so we can
> > > apply this to drm-misc-next.
> > > 
> > > 	Sam
> > > 
> > >  drivers/gpu/drm/mgag200/mgag200_drv.c | 1 +
> > >  1 file changed, 1 insertion(+)
> > > 
> > > diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
> > > index 09170d46aa53..b282b0e42c2d 100644
> > > --- a/drivers/gpu/drm/mgag200/mgag200_drv.c
> > > +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
> > > @@ -9,6 +9,7 @@
> > >  #include <linux/console.h>
> > >  #include <linux/module.h>
> > >  #include <linux/pci.h>
> > > +#include <linux/vmalloc.h>
> > >  
> > >  #include <drm/drm_drv.h>
> > >  #include <drm/drm_file.h>
> > > 
> > 
> > -- 
> > Thomas Zimmermann
> > Graphics Driver Developer
> > SUSE Software Solutions Germany GmbH
> > Maxfeldstr. 5, 90409 Nürnberg, Germany
> > (HRB 36809, AG Nürnberg)
> > Geschäftsführer: Felix Imendörffer
> > 
> 
> 
> 
> _______________________________________________
> dri-devel mailing list
> [e-mail]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

Patch

diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
index 09170d46aa53..b282b0e42c2d 100644
--- a/drivers/gpu/drm/mgag200/mgag200_drv.c
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
@@ -9,6 +9,7 @@ 
 #include <linux/console.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <linux/vmalloc.h>
 
 #include <drm/drm_drv.h>
 #include <drm/drm_file.h>