[parisc-linux-cvs] linux deller

[Helge Deller]

--Boundary-00=_Ka4j9k38S6iruYg
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 8bit
Content-Disposition: inline

On Monday 23 September 2002 23:22, Helge Deller wrote:
> CVSROOT:	/var/cvs
> Module name:	linux
> Changes by:	deller	02/09/23 15:22:59
>
> Modified files:
> 	.              : Makefile
> 	drivers/video/sti: stifb.c
>
> Log message:
> 2.4.18-pa20:
> - allow stifb to run in 8bpp or 32bpp acording to the
> video=stifb:bpp:8  or  video=stifb:bpp:32
> kernel command line parameter.
>
> Patch by Steve Pacenka <spacenka AT lightlink DOT com>


Of course this is 2.4.19-pa20:


--Boundary-00=_Ka4j9k38S6iruYg
Content-Type: text/plain;
  charset="iso-8859-1";
  name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="diff"

Index: Makefile
===================================================================
RCS file: /var/cvs/linux/Makefile,v
retrieving revision 1.354
diff -u -p -r1.354 Makefile
--- Makefile	22 Sep 2002 02:21:05 -0000	1.354
+++ Makefile	23 Sep 2002 21:20:27 -0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 19
-EXTRAVERSION = -pa19
+EXTRAVERSION = -pa20
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
Index: drivers/video/sti/stifb.c
===================================================================
RCS file: /var/cvs/linux/drivers/video/sti/stifb.c,v
retrieving revision 1.34
diff -u -p -r1.34 stifb.c
--- drivers/video/sti/stifb.c	13 Jul 2002 20:39:32 -0000	1.34
+++ drivers/video/sti/stifb.c	23 Sep 2002 21:20:29 -0000
@@ -133,7 +133,7 @@ struct stifb_info {
 #endif			
 };
 
-static int stifb_force_bpp[MAX_STI_ROMS] = {0, };
+static int stifb_force_bpp[MAX_STI_ROMS];
 
 /* ------------------- chipset specific functions -------------------------- */
 
@@ -1290,7 +1290,10 @@ stifb_init_fb(struct sti_struct *sti, in
 		fb->id = S9000_ID_A1659A;
 		break;
 	case S9000_ID_A1439A:	/* CRX24/A1439A */
-		bpp = 32;
+		if (force_bpp == 8 || force_bpp == 32)
+		  bpp = force_bpp;
+		else
+		  bpp = 32;
 		break;
 	case S9000_ID_HCRX:	/* Hyperdrive/HCRX */
 		memset(&fb->ngle_rom, 0, sizeof(fb->ngle_rom));

--Boundary-00=_Ka4j9k38S6iruYg--