| Message ID | 1347452412-7129-1-git-send-email-dan@danny.cz (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Wed, 2012-09-12 at 14:20 +0200, Dan Horák wrote: > I'm reviving an old patch from 2009 that adds support for GXT4000P and GXT6500P > adapter to the gxt4500 driver. Who is the original author ? Cheers, Ben. > See threads at http://marc.info/?l=linux-fbdev-devel&m=124345080216952&w=2 > and https://lists.ozlabs.org/pipermail/linuxppc-dev/2009-June/072672.html > for more details. > > This patch adds support for GXT4000P and GXT6500P cards found on some > IBM pSeries machines. > GXT4000P/6000P and GXT4500P/6500P couples are identical from > software's point of view and are based on the same Raster Engine > (RC1000), except for a different reference clock for the PLL. > GXT6x00P models are equipped with an additional Geometry Engine > (GT1000) but this driver doesn't use it. > > Signed-off-by: Nico Macrionitis <acrux@cruxppc.org> > Signed-off-by: Giuseppe Coviello <cjg@cruxppc.org> > Tested-by: Dan Horák <dan@danny.cz> > --- > drivers/video/Kconfig | 8 +++++--- > drivers/video/gxt4500.c | 15 +++++++++++++-- > 2 files changed, 18 insertions(+), 5 deletions(-) > > diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig > index 0217f74..c89eb1e 100644 > --- a/drivers/video/Kconfig > +++ b/drivers/video/Kconfig > @@ -2167,14 +2167,16 @@ config FB_PNX4008_DUM_RGB > Say Y here to enable support for PNX4008 RGB Framebuffer > > config FB_IBM_GXT4500 > - tristate "Framebuffer support for IBM GXT4500P adaptor" > + tristate "Framebuffer support for IBM GXT4000P/4500P/6000P/6500P adaptors" > depends on FB && PPC > select FB_CFB_FILLRECT > select FB_CFB_COPYAREA > select FB_CFB_IMAGEBLIT > ---help--- > - Say Y here to enable support for the IBM GXT4500P display > - adaptor, found on some IBM System P (pSeries) machines. > + Say Y here to enable support for the IBM GXT4000P/6000P and > + GXT4500P/6500P display adaptor based on Raster Engine RC1000, > + found on some IBM System P (pSeries) machines. This driver > + doesn't use Geometry Engine GT1000. > > config FB_PS3 > tristate "PS3 GPU framebuffer driver" > diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c > index 0fad23f..755c3e7 100644 > --- a/drivers/video/gxt4500.c > +++ b/drivers/video/gxt4500.c > @@ -1,5 +1,6 @@ > /* > - * Frame buffer device for IBM GXT4500P and GXT6000P display adaptors > + * Frame buffer device for IBM GXT4500P/6500P and GXT4000P/6000P > + * display adaptors > * > * Copyright (C) 2006 Paul Mackerras, IBM Corp. <paulus@samba.org> > */ > @@ -14,6 +15,8 @@ > #include <linux/string.h> > > #define PCI_DEVICE_ID_IBM_GXT4500P 0x21c > +#define PCI_DEVICE_ID_IBM_GXT6500P 0x21b > +#define PCI_DEVICE_ID_IBM_GXT4000P 0x16e > #define PCI_DEVICE_ID_IBM_GXT6000P 0x170 > > /* GXT4500P registers */ > @@ -173,6 +176,8 @@ static const struct fb_videomode defaultmode __devinitdata = { > /* List of supported cards */ > enum gxt_cards { > GXT4500P, > + GXT6500P, > + GXT4000P, > GXT6000P > }; > > @@ -182,6 +187,8 @@ static const struct cardinfo { > const char *cardname; > } cardinfo[] = { > [GXT4500P] = { .refclk_ps = 9259, .cardname = "IBM GXT4500P" }, > + [GXT6500P] = { .refclk_ps = 9259, .cardname = "IBM GXT6500P" }, > + [GXT4000P] = { .refclk_ps = 40000, .cardname = "IBM GXT4000P" }, > [GXT6000P] = { .refclk_ps = 40000, .cardname = "IBM GXT6000P" }, > }; > > @@ -736,6 +743,10 @@ static void __devexit gxt4500_remove(struct pci_dev *pdev) > static const struct pci_device_id gxt4500_pci_tbl[] = { > { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT4500P), > .driver_data = GXT4500P }, > + { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT6500P), > + .driver_data = GXT6500P }, > + { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT4000P), > + .driver_data = GXT4000P }, > { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT6000P), > .driver_data = GXT6000P }, > { 0 } > @@ -768,7 +779,7 @@ static void __exit gxt4500_exit(void) > module_exit(gxt4500_exit); > > MODULE_AUTHOR("Paul Mackerras <paulus@samba.org>"); > -MODULE_DESCRIPTION("FBDev driver for IBM GXT4500P/6000P"); > +MODULE_DESCRIPTION("FBDev driver for IBM GXT4500P/6500P and GXT4000P/6000P"); > MODULE_LICENSE("GPL"); > module_param(mode_option, charp, 0); > MODULE_PARM_DESC(mode_option, "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\"");
On Thu, Sep 13, 2012 at 2:01 AM, Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote: > On Wed, 2012-09-12 at 14:20 +0200, Dan Horák wrote: >> I'm reviving an old patch from 2009 that adds support for GXT4000P and GXT6500P >> adapter to the gxt4500 driver. > > Who is the original author ? Signed-off-by: Nico Macrionitis <acrux@cruxppc.org> Signed-off-by: Giuseppe Coviello <cjg@cruxppc.org> It even has your ack (albeit not in canonical form ;-), cfr. >> See threads at http://marc.info/?l=linux-fbdev-devel&m=124345080216952&w=2 >> and https://lists.ozlabs.org/pipermail/linuxppc-dev/2009-June/072672.html >> for more details. 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
On Thu, 2012-09-13 at 07:01 +0200, Geert Uytterhoeven wrote: > On Thu, Sep 13, 2012 at 2:01 AM, Benjamin Herrenschmidt > <benh@kernel.crashing.org> wrote: > > On Wed, 2012-09-12 at 14:20 +0200, Dan Horák wrote: > >> I'm reviving an old patch from 2009 that adds support for GXT4000P and GXT6500P > >> adapter to the gxt4500 driver. > > > > Who is the original author ? > > Signed-off-by: Nico Macrionitis <acrux@cruxppc.org> > Signed-off-by: Giuseppe Coviello <cjg@cruxppc.org> > > It even has your ack (albeit not in canonical form ;-), cfr. Well, the submission had no From: line matching the top S-O-B so I'm not sure who actually wrote the patch :-) Cheers, Ben > >> See threads at http://marc.info/?l=linux-fbdev-devel&m=124345080216952&w=2 > >> and https://lists.ozlabs.org/pipermail/linuxppc-dev/2009-June/072672.html > >> for more details. > > 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
Benjamin Herrenschmidt píše v Čt 13. 09. 2012 v 17:50 +1000: > On Thu, 2012-09-13 at 07:01 +0200, Geert Uytterhoeven wrote: > > On Thu, Sep 13, 2012 at 2:01 AM, Benjamin Herrenschmidt > > <benh@kernel.crashing.org> wrote: > > > On Wed, 2012-09-12 at 14:20 +0200, Dan Horák wrote: > > >> I'm reviving an old patch from 2009 that adds support for GXT4000P and GXT6500P > > >> adapter to the gxt4500 driver. > > > > > > Who is the original author ? > > > > Signed-off-by: Nico Macrionitis <acrux@cruxppc.org> > > Signed-off-by: Giuseppe Coviello <cjg@cruxppc.org> > > > > It even has your ack (albeit not in canonical form ;-), cfr. > > Well, the submission had no From: line matching the top S-O-B so I'm not > sure who actually wrote the patch :-) it must be one of the guys in S-O-B, I have only volunteered to resubmit it to get it finally included in mainline Dan > Cheers, > Ben > > > >> See threads at http://marc.info/?l=linux-fbdev-devel&m=124345080216952&w=2 > > >> and https://lists.ozlabs.org/pipermail/linuxppc-dev/2009-June/072672.html > > >> for more details. > > > > 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 > > >
On Thu, 13 Sep 2012 17:50:05 +1000 Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote: > On Thu, 2012-09-13 at 07:01 +0200, Geert Uytterhoeven wrote: > > On Thu, Sep 13, 2012 at 2:01 AM, Benjamin Herrenschmidt > > <benh@kernel.crashing.org> wrote: > > > On Wed, 2012-09-12 at 14:20 +0200, Dan Horák wrote: > > >> I'm reviving an old patch from 2009 that adds support for GXT4000P and GXT6500P > > >> adapter to the gxt4500 driver. > > > > > > Who is the original author ? > > > > Signed-off-by: Nico Macrionitis <acrux@cruxppc.org> > > Signed-off-by: Giuseppe Coviello <cjg@cruxppc.org> > > > > It even has your ack (albeit not in canonical form ;-), cfr. > > Well, the submission had no From: line matching the top S-O-B so I'm not > sure who actually wrote the patch :-) > > Cheers, > Ben > hi Ben, i confirm that patch has been written/tested/submitted from Giuseppe and me (CRUX PPC project). my regards, --nico
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 0217f74..c89eb1e 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -2167,14 +2167,16 @@ config FB_PNX4008_DUM_RGB Say Y here to enable support for PNX4008 RGB Framebuffer config FB_IBM_GXT4500 - tristate "Framebuffer support for IBM GXT4500P adaptor" + tristate "Framebuffer support for IBM GXT4000P/4500P/6000P/6500P adaptors" depends on FB && PPC select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT ---help--- - Say Y here to enable support for the IBM GXT4500P display - adaptor, found on some IBM System P (pSeries) machines. + Say Y here to enable support for the IBM GXT4000P/6000P and + GXT4500P/6500P display adaptor based on Raster Engine RC1000, + found on some IBM System P (pSeries) machines. This driver + doesn't use Geometry Engine GT1000. config FB_PS3 tristate "PS3 GPU framebuffer driver" diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c index 0fad23f..755c3e7 100644 --- a/drivers/video/gxt4500.c +++ b/drivers/video/gxt4500.c @@ -1,5 +1,6 @@ /* - * Frame buffer device for IBM GXT4500P and GXT6000P display adaptors + * Frame buffer device for IBM GXT4500P/6500P and GXT4000P/6000P + * display adaptors * * Copyright (C) 2006 Paul Mackerras, IBM Corp. <paulus@samba.org> */ @@ -14,6 +15,8 @@ #include <linux/string.h> #define PCI_DEVICE_ID_IBM_GXT4500P 0x21c +#define PCI_DEVICE_ID_IBM_GXT6500P 0x21b +#define PCI_DEVICE_ID_IBM_GXT4000P 0x16e #define PCI_DEVICE_ID_IBM_GXT6000P 0x170 /* GXT4500P registers */ @@ -173,6 +176,8 @@ static const struct fb_videomode defaultmode __devinitdata = { /* List of supported cards */ enum gxt_cards { GXT4500P, + GXT6500P, + GXT4000P, GXT6000P }; @@ -182,6 +187,8 @@ static const struct cardinfo { const char *cardname; } cardinfo[] = { [GXT4500P] = { .refclk_ps = 9259, .cardname = "IBM GXT4500P" }, + [GXT6500P] = { .refclk_ps = 9259, .cardname = "IBM GXT6500P" }, + [GXT4000P] = { .refclk_ps = 40000, .cardname = "IBM GXT4000P" }, [GXT6000P] = { .refclk_ps = 40000, .cardname = "IBM GXT6000P" }, }; @@ -736,6 +743,10 @@ static void __devexit gxt4500_remove(struct pci_dev *pdev) static const struct pci_device_id gxt4500_pci_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT4500P), .driver_data = GXT4500P }, + { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT6500P), + .driver_data = GXT6500P }, + { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT4000P), + .driver_data = GXT4000P }, { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT6000P), .driver_data = GXT6000P }, { 0 } @@ -768,7 +779,7 @@ static void __exit gxt4500_exit(void) module_exit(gxt4500_exit); MODULE_AUTHOR("Paul Mackerras <paulus@samba.org>"); -MODULE_DESCRIPTION("FBDev driver for IBM GXT4500P/6000P"); +MODULE_DESCRIPTION("FBDev driver for IBM GXT4500P/6500P and GXT4000P/6000P"); MODULE_LICENSE("GPL"); module_param(mode_option, charp, 0); MODULE_PARM_DESC(mode_option, "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\"");