[PATCH] arm64: add screen_info for console support

[PATCH] arm64: add screen_info for console support

[Mark Salter]

The arm64 port doesn't provide a screen_info struct for console support
which leads to a build failure with some configurations:

  drivers/video/console/vgacon.c:820: undefined reference to `screen_info'

This patch adds an empty declaration of screen_info to fix the build
problem. Some additional runtime code is needed to actually make it
useful.

Signed-off-by: Mark Salter <msalter@redhat.com>
---
 arch/arm64/kernel/setup.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index add6ea6..eb9f93a 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -64,6 +64,10 @@ static const char *cpu_name;
 static const char *machine_name;
 phys_addr_t __fdt_pointer __initdata;
 
+#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)                                               
+struct screen_info screen_info;                                                                                
+#endif                                                                                                         
+
 /*
  * Standard memory resources
  */
-- 
1.8.1.4

[PATCH] arm64: add screen_info for console support

[Will Deacon]

Hi Mark,

On Sun, Aug 18, 2013 at 05:22:50PM +0100, Mark Salter wrote:
> The arm64 port doesn't provide a screen_info struct for console support
> which leads to a build failure with some configurations:
> 
>   drivers/video/console/vgacon.c:820: undefined reference to `screen_info'
> 
> This patch adds an empty declaration of screen_info to fix the build
> problem. Some additional runtime code is needed to actually make it
> useful.
> 
> Signed-off-by: Mark Salter <msalter@redhat.com>
> ---
>  arch/arm64/kernel/setup.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
> index add6ea6..eb9f93a 100644
> --- a/arch/arm64/kernel/setup.c
> +++ b/arch/arm64/kernel/setup.c
> @@ -64,6 +64,10 @@ static const char *cpu_name;
>  static const char *machine_name;
>  phys_addr_t __fdt_pointer __initdata;
>  
> +#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)                                               
> +struct screen_info screen_info;                                                                                
> +#endif                                                                                                         

You may be able to do something similar to the proposal for PARPORT here and
factor out the lengthy "depends on" clause for VGA_CONSOLE instead of adding
the dummy info.

Unfortunately, I can't make any promise of further bonus points :)

Will

[PATCH] arm64: add screen_info for console support

[Catalin Marinas]

On Tue, Aug 20, 2013 at 02:37:33PM +0100, Will Deacon wrote:
> Hi Mark,
> 
> On Sun, Aug 18, 2013 at 05:22:50PM +0100, Mark Salter wrote:
> > The arm64 port doesn't provide a screen_info struct for console support
> > which leads to a build failure with some configurations:
> > 
> >   drivers/video/console/vgacon.c:820: undefined reference to `screen_info'
> > 
> > This patch adds an empty declaration of screen_info to fix the build
> > problem. Some additional runtime code is needed to actually make it
> > useful.
> > 
> > Signed-off-by: Mark Salter <msalter@redhat.com>
> > ---
> >  arch/arm64/kernel/setup.c | 4 ++++
> >  1 file changed, 4 insertions(+)
> > 
> > diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
> > index add6ea6..eb9f93a 100644
> > --- a/arch/arm64/kernel/setup.c
> > +++ b/arch/arm64/kernel/setup.c
> > @@ -64,6 +64,10 @@ static const char *cpu_name;
> >  static const char *machine_name;
> >  phys_addr_t __fdt_pointer __initdata;
> >  
> > +#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)
> > +struct screen_info screen_info;
> > +#endif
> 
> You may be able to do something similar to the proposal for PARPORT here and
> factor out the lengthy "depends on" clause for VGA_CONSOLE instead of adding
> the dummy info.

I was wondering about this but do we need screen_info for DUMMY_CONSOLE
as well?

-- 
Catalin

[PATCH] arm64: add screen_info for console support

[Mark Salter]

On Tue, 2013-08-20 at 18:14 +0100, Catalin Marinas wrote:
> I was wondering about this but do we need screen_info for DUMMY_CONSOLE
> as well?

I thought so because my grep turned up a reference to screen_info in
dummycon.c but a closer look shows that only applies to arm.

--Mark