[PATCH 10/12] fbdev: Static pseudocolor with depth less than 4 does exist

[PATCH 10/12] fbdev: Static pseudocolor with depth less than 4 does exist

[Antonino A. Daplas]

A static pseudocolor visual with depth less than 4 does exist, so let's
not accidentally upscale the depth with this configuration

Signed-off-by: Antonino Daplas <adaplas@pol.net>
---

 drivers/video/fbmem.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 1cb9acf..19cb4c5 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -432,7 +432,7 @@ int fb_prepare_logo(struct fb_info *info
 			depth = info->var.green.length;
 	}
 
-	if (info->fix.visual == FB_VISUAL_STATIC_PSEUDOCOLOR) {
+	if (info->fix.visual == FB_VISUAL_STATIC_PSEUDOCOLOR && depth > 4) {
 		/* assume console colormap */
 		depth = 4;
 	}



-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

Re: [PATCH 10/12] fbdev: Static pseudocolor with depth less than 4 does exist

[Geert Uytterhoeven]

On Sat, 29 Apr 2006, Antonino A. Daplas wrote:
> A static pseudocolor visual with depth less than 4 does exist, so let's
> not accidentally upscale the depth with this configuration

Yes it does, at least on Mac/m68k.

Now the real question is: why doesn't macfb set FB_VISUAL_STATIC_PSEUDOCOLOR if
there's no macfb_setpalette routine?

> Signed-off-by: Antonino Daplas <adaplas@pol.net>
> ---
> 
>  drivers/video/fbmem.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
> index 1cb9acf..19cb4c5 100644
> --- a/drivers/video/fbmem.c
> +++ b/drivers/video/fbmem.c
> @@ -432,7 +432,7 @@ int fb_prepare_logo(struct fb_info *info
>  			depth = info->var.green.length;
>  	}
>  
> -	if (info->fix.visual == FB_VISUAL_STATIC_PSEUDOCOLOR) {
> +	if (info->fix.visual == FB_VISUAL_STATIC_PSEUDOCOLOR && depth > 4) {
>  		/* assume console colormap */
>  		depth = 4;
>  	}

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


-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

Re: [PATCH 10/12] fbdev: Static pseudocolor with depth less than 4 does exist

[Antonino A. Daplas]

Geert Uytterhoeven wrote:
> On Sat, 29 Apr 2006, Antonino A. Daplas wrote:
>> A static pseudocolor visual with depth less than 4 does exist, so let's
>> not accidentally upscale the depth with this configuration
> 
> Yes it does, at least on Mac/m68k.
> 
> Now the real question is: why doesn't macfb set FB_VISUAL_STATIC_PSEUDOCOLOR if
> there's no macfb_setpalette routine?

It should.  The other question is, what to do with static pseudocolor?
Do we always assume console colors?  Or do we make drivers fill their own
info->cmap entries and not alter the contents when fb_set_cmap() is called?

Also, I made vesafb's visual static_pseudocolor if the mode is not VGA compatible
and the protected mode interface is absent.  Fortunately, the VGA colormap is carried
over to vesafb, so by accident, the console color map coincides with the hardware
CLUT and the logo and console displays correctly.

Tony


-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

Re: [PATCH 10/12] fbdev: Static pseudocolor with depth less than 4 does exist

[Brad Boyer]

On Sat, Apr 29, 2006 at 08:28:37PM +0200, Geert Uytterhoeven wrote:
> On the other hand, at least on Mac/m68k the palette is inherited from MacOS.
> It would be possible for the Penguin booter to programs the standard console
> palette under MacOS, just before booting the kernel, but as I don't know much
> about Penguin, I have no idea whether that's currently done.

I'm not sure I have the latest version of Penguin, but the version I
have laying around has an option to set the current palette before
loading the kernel. I don't remember if it was on by default.

	Brad Boyer
	flar@allandria.com



-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

Re: [PATCH 10/12] fbdev: Static pseudocolor with depth less than 4 does exist

[Geert Uytterhoeven]

[ linux-mac68k@mac.linux-m68k.org removed as it seems to bounce? ]

On Sat, 29 Apr 2006, Antonino A. Daplas wrote:
> Geert Uytterhoeven wrote:
> > On Sat, 29 Apr 2006, Antonino A. Daplas wrote:
> >> A static pseudocolor visual with depth less than 4 does exist, so let's
> >> not accidentally upscale the depth with this configuration
> > 
> > Yes it does, at least on Mac/m68k.
> > 
> > Now the real question is: why doesn't macfb set FB_VISUAL_STATIC_PSEUDOCOLOR if
> > there's no macfb_setpalette routine?
> 
> It should.  The other question is, what to do with static pseudocolor?
> Do we always assume console colors?  Or do we make drivers fill their own
> info->cmap entries and not alter the contents when fb_set_cmap() is called?

I don't think you can always assume console colors. Only the driver (if anyone
knows at all) knows the palette.

On the other hand, at least on Mac/m68k the palette is inherited from MacOS.
It would be possible for the Penguin booter to programs the standard console
palette under MacOS, just before booting the kernel, but as I don't know much
about Penguin, I have no idea whether that's currently done.

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


-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

Re: [PATCH 10/12] fbdev: Static pseudocolor with depth less than 4 does exist

[Antonino A. Daplas]

Geert Uytterhoeven wrote:
> [ linux-mac68k@mac.linux-m68k.org removed as it seems to bounce? ]
> 
> On Sat, 29 Apr 2006, Antonino A. Daplas wrote:
>> Geert Uytterhoeven wrote:
>>> On Sat, 29 Apr 2006, Antonino A. Daplas wrote:
>>>> A static pseudocolor visual with depth less than 4 does exist, so let's
>>>> not accidentally upscale the depth with this configuration
>>> Yes it does, at least on Mac/m68k.
>>>
>>> Now the real question is: why doesn't macfb set FB_VISUAL_STATIC_PSEUDOCOLOR if
>>> there's no macfb_setpalette routine?
>> It should.  The other question is, what to do with static pseudocolor?
>> Do we always assume console colors?  Or do we make drivers fill their own
>> info->cmap entries and not alter the contents when fb_set_cmap() is called?
> 
> I don't think you can always assume console colors. Only the driver (if anyone
> knows at all) knows the palette.
> 
> On the other hand, at least on Mac/m68k the palette is inherited from MacOS.
> It would be possible for the Penguin booter to programs the standard console
> palette under MacOS, just before booting the kernel, but as I don't know much
> about Penguin, I have no idea whether that's currently done.
> 

Making the palette match the console would be the simplest solution.  Otherwise,
we make the drivers export a color map which will be read-only.  Then fbcon and
other clients will just have to alter their palette to best fit the hardware.

Tony


-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642