From: Giuseppe C. <cj...@cr...> - 2009-05-27 18:59:02
|
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. Regards, Giuseppe Signed-off-by: Nico Macrionitis <ac...@cr...> Signed-off-by: Giuseppe Coviello <cj...@cr...> --- /usr/src/linux-2.6.30-rc3/drivers/video/Kconfig 2009-04-22 05:07:00.000000000 +0200 +++ Kconfig 2009-05-05 10:55:17.000000000 +0200 @@ -1985,8 +1985,10 @@ 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" --- /usr/src/linux-2.6.30-rc3/drivers/video/gxt4500.c 2009-04-22 05:07:00.000000000 +0200 +++ gxt4500c 2009-05-05 10:47:41.000000000 +0200 @@ -1,6 +1,7 @@ /* - * 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. <pa...@sa...> */ @@ -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 @@ /* List of supported cards */ enum gxt_cards { GXT4500P, + GXT6500P, + GXT4000P, GXT6000P }; @@ -182,6 +187,8 @@ 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 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 @@ module_exit(gxt4500_exit); MODULE_AUTHOR("Paul Mackerras <pa...@sa...>"); -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>]\""); |
From: Krzysztof H. <krz...@po...> - 2009-05-30 11:35:54
|
On Wed, 27 May 2009 20:57:55 +0200 Giuseppe Coviello <cj...@cr...> wrote: > 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. > > Regards, Giuseppe > > > Signed-off-by: Nico Macrionitis <ac...@cr...> > Signed-off-by: Giuseppe Coviello <cj...@cr...> > > --- /usr/src/linux-2.6.30-rc3/drivers/video/Kconfig 2009-04-22 > 05:07:00.000000000 +0200 > +++ Kconfig 2009-05-05 10:55:17.000000000 +0200 > @@ -1985,8 +1985,10 @@ > 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. > Please also change name of the option to reflect the fact it supports more than just the GXT4500P, e.g. "Framebuffer support for IBM GXT4000P/4500P/6000P/6500P adaptors" Please cc the updated patch to the lin...@oz.... Regards, Krzysztof ---------------------------------------------------------------------- Przekaz dalej wiadomosc: Zawsze warto oszczedzac. Teraz 5,5%! Sprawdz > http://link.interia.pl/f21b1 |
From: Giuseppe C. <cj...@cr...> - 2009-06-01 07:33:25
|
Il giorno sab, 30/05/2009 alle 13.42 +0200, Krzysztof Helt ha scritto: > On Wed, 27 May 2009 20:57:55 +0200 > Giuseppe Coviello <cj...@cr...> wrote: > > > 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. > > > > Regards, Giuseppe > > > > > > Please also change name of the option to reflect the fact it supports > more than just the GXT4500P, e.g. > > "Framebuffer support for IBM GXT4000P/4500P/6000P/6500P adaptors" > > Please cc the updated patch to the lin...@oz.... > > Regards, > Krzysztof I've made the changes that you have suggested. Regards, Giuseppe Signed-off-by: Nico Macrionitis <ac...@cr...> Signed-off-by: Giuseppe Coviello <cj...@cr...> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 0048f11..7ee1e65 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -1964,14 +1964,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 896e53d..a3c4d41 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. <pa...@sa...> */ @@ -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 <pa...@sa...>"); -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>]\""); |
From: Benjamin H. <be...@ke...> - 2009-06-02 01:05:53
|
On Mon, 2009-06-01 at 09:32 +0200, Giuseppe Coviello wrote: > > Signed-off-by: Nico Macrionitis <ac...@cr...> > Signed-off-by: Giuseppe Coviello <cj...@cr...> As long as you guys have verified that it actually works, I have no objection. Ack. Cheers, Ben. > diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig > index 0048f11..7ee1e65 100644 > --- a/drivers/video/Kconfig > +++ b/drivers/video/Kconfig > @@ -1964,14 +1964,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 896e53d..a3c4d41 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. <pa...@sa...> > */ > @@ -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 <pa...@sa...>"); > -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>]\""); > > > _______________________________________________ > Linuxppc-dev mailing list > Lin...@oz... > https://ozlabs.org/mailman/listinfo/linuxppc-dev |