From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Garzik Subject: Re: [PATCH] cirrusfb: it lives! Date: Tue, 22 Jun 2004 16:36:53 -0400 Sender: linux-fbdev-devel-admin@lists.sourceforge.net Message-ID: <40D89865.3040606@pobox.com> References: <20040622202758.GA10135@havoc.gtf.org> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.12] helo=sc8-sf-mx2.sourceforge.net) by sc8-sf-list1.sourceforge.net with esmtp (Exim 4.30) id 1Bcs1F-0004C2-Gz for linux-fbdev-devel@lists.sourceforge.net; Tue, 22 Jun 2004 13:37:25 -0700 Received: from parcelfarce.linux.theplanet.co.uk ([195.92.249.252] helo=www.linux.org.uk ident=93) by sc8-sf-mx2.sourceforge.net with esmtp (TLSv1:AES256-SHA:256) (Exim 4.30) id 1Bcs1E-0002LY-Sg for linux-fbdev-devel@lists.sourceforge.net; Tue, 22 Jun 2004 13:37:25 -0700 In-Reply-To: <20040622202758.GA10135@havoc.gtf.org> Errors-To: linux-fbdev-devel-admin@lists.sourceforge.net List-Unsubscribe: , List-Id: List-Post: List-Help: List-Subscribe: , List-Archive: Content-Type: text/plain; charset="us-ascii"; format="flowed" To: David Eger Cc: akpm@osdl.org, linux-fbdev-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Jeff Garzik , jsimmons@infradead.org David Eger wrote: > Dear Andrew, > > This patch brings the cirrusfb driver up to date with 2.6. cirrusfb > has suffered bit rot like you wouldn't believe (last updated... 2.3.x era?). > The driver will now compile again, and you can change to a high resolution > text mode with stty. Known defects: doesn't play nice with X, nor fbset. > Nonetheless, please apply to -mm and forward to mainline. Groovy :) If I am listed in MAINTAINERS somewhere, feel free to remove me... :) > cirrusfb: port from Linux 2.4 to Linux 2.6 fb API > aka The Big Overhaul(tm) > > Signed-off-by: David Eger > > diff -Nru a/drivers/video/Kconfig b/drivers/video/Kconfig > --- a/drivers/video/Kconfig 2004-06-22 16:12:19 -04:00 > +++ b/drivers/video/Kconfig 2004-06-22 16:12:19 -04:00 > @@ -40,7 +40,7 @@ > > config FB_CIRRUS > tristate "Cirrus Logic support" > - depends on FB && (AMIGA || PCI) && BROKEN > + depends on FB && (AMIGA || PCI) > ---help--- > This enables support for Cirrus Logic GD542x/543x based boards on > Amiga: SD64, Piccolo, Picasso II/II+, Picasso IV, or EGS Spectrum. > diff -Nru a/drivers/video/Makefile b/drivers/video/Makefile > --- a/drivers/video/Makefile 2004-06-22 16:12:19 -04:00 > +++ b/drivers/video/Makefile 2004-06-22 16:12:19 -04:00 > @@ -39,7 +39,7 @@ > obj-$(CONFIG_FB_OF) += offb.o cfbfillrect.o cfbimgblt.o cfbcopyarea.o > obj-$(CONFIG_FB_IMSTT) += imsttfb.o cfbimgblt.o > obj-$(CONFIG_FB_RETINAZ3) += retz3fb.o > -obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o > +obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o cfbfillrect.o cfbimgblt.o cfbcopyarea.o > obj-$(CONFIG_FB_TRIDENT) += tridentfb.o cfbfillrect.o cfbimgblt.o cfbcopyarea.o > obj-$(CONFIG_FB_S3TRIO) += S3triofb.o > obj-$(CONFIG_FB_TGA) += tgafb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o > diff -Nru a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c > --- a/drivers/video/cirrusfb.c 2004-06-22 16:12:19 -04:00 > +++ b/drivers/video/cirrusfb.c 2004-06-22 16:12:20 -04:00 > @@ -1,10 +1,13 @@ > /* > - * drivers/video/clgenfb.c - driver for Cirrus Logic chipsets > + * drivers/video/cirrusfb.c - driver for Cirrus Logic chipsets > * > * Copyright 1999-2001 Jeff Garzik > * > * Contributors (thanks, all!) > * > + * David Eger: > + * Overhaul for Linux 2.6 > + * > * Jeff Rugen: > * Major contributions; Motorola PowerStack (PPC and PCI) support, > * GD54xx, 1280x1024 mode support, change MCLK based on VCLK. > @@ -15,9 +18,9 @@ > * Lars Hecking: > * Amiga updates and testing. > * > - * Original clgenfb author: Frank Neumann > + * Original cirrusfb author: Frank Neumann > * > - * Based on retz3fb.c and clgen.c: > + * Based on retz3fb.c and cirrusfb.c: > * Copyright (C) 1997 Jes Sorensen > * Copyright (C) 1996 Frank Neumann > * > @@ -31,7 +34,7 @@ > * > */ > > -#define CLGEN_VERSION "1.9.9.1" > +#define CIRRUSFB_VERSION "2.0-pre2" > > #include > #include > @@ -63,15 +66,8 @@ > #define isPReP 0 > #endif > > -#include