CRUX PPC
A lightweight GNU/Linux distribution for PowerPC!
Subversion Repository
Parent Directory
| 
Revision Log
Revision 62 -
(hide annotations)
Thu Feb 3 22:44:55 2011 UTC (2 years, 3 months ago) by acrux
File size: 2663 byte(s)
Thu Feb 3 22:44:55 2011 UTC (2 years, 3 months ago) by acrux
File size: 2663 byte(s)
synced with 2.7RC2
| 1 | acrux | 62 | --- linux-2.6.30-rc3/drivers/video/Kconfig 2009-04-22 05:07:00.000000000 +0200 |
| 2 | +++ b/drivers/video/Kconfig 2009-05-05 10:55:17.000000000 +0200 | ||
| 3 | @@ -1985,8 +1985,10 @@ | ||
| 4 | select FB_CFB_COPYAREA | ||
| 5 | select FB_CFB_IMAGEBLIT | ||
| 6 | ---help--- | ||
| 7 | - Say Y here to enable support for the IBM GXT4500P display | ||
| 8 | - adaptor, found on some IBM System P (pSeries) machines. | ||
| 9 | + Say Y here to enable support for the IBM GXT4000P/6000P and | ||
| 10 | + GXT4500P/6500P display adaptor based on Raster Engine RC1000, | ||
| 11 | + found on some IBM System P (pSeries) machines. This driver | ||
| 12 | + doesn't use Geometry Engine GT1000. | ||
| 13 | |||
| 14 | config FB_PS3 | ||
| 15 | tristate "PS3 GPU framebuffer driver" | ||
| 16 | --- linux-2.6.30-rc3/drivers/video/gxt4500.c 2009-04-22 05:07:00.000000000 +0200 | ||
| 17 | +++ drivers/video/gxt4500c 2009-05-05 10:47:41.000000000 +0200 | ||
| 18 | @@ -1,6 +1,7 @@ | ||
| 19 | /* | ||
| 20 | - * Frame buffer device for IBM GXT4500P and GXT6000P display adaptors | ||
| 21 | - * | ||
| 22 | + * Frame buffer device for IBM GXT4500P/6500P and GXT4000P/6000P | ||
| 23 | + * display adaptors | ||
| 24 | + * | ||
| 25 | * Copyright (C) 2006 Paul Mackerras, IBM Corp. <paulus@samba.org> | ||
| 26 | */ | ||
| 27 | |||
| 28 | @@ -14,6 +15,8 @@ | ||
| 29 | #include <linux/string.h> | ||
| 30 | |||
| 31 | #define PCI_DEVICE_ID_IBM_GXT4500P 0x21c | ||
| 32 | +#define PCI_DEVICE_ID_IBM_GXT6500P 0x21b | ||
| 33 | +#define PCI_DEVICE_ID_IBM_GXT4000P 0x16e | ||
| 34 | #define PCI_DEVICE_ID_IBM_GXT6000P 0x170 | ||
| 35 | |||
| 36 | /* GXT4500P registers */ | ||
| 37 | @@ -173,6 +176,8 @@ | ||
| 38 | /* List of supported cards */ | ||
| 39 | enum gxt_cards { | ||
| 40 | GXT4500P, | ||
| 41 | + GXT6500P, | ||
| 42 | + GXT4000P, | ||
| 43 | GXT6000P | ||
| 44 | }; | ||
| 45 | |||
| 46 | @@ -182,6 +187,8 @@ | ||
| 47 | const char *cardname; | ||
| 48 | } cardinfo[] = { | ||
| 49 | [GXT4500P] = { .refclk_ps = 9259, .cardname = "IBM GXT4500P" }, | ||
| 50 | + [GXT6500P] = { .refclk_ps = 9259, .cardname = "IBM GXT6500P" }, | ||
| 51 | + [GXT4000P] = { .refclk_ps = 40000, .cardname = "IBM GXT4000P" }, | ||
| 52 | [GXT6000P] = { .refclk_ps = 40000, .cardname = "IBM GXT6000P" }, | ||
| 53 | }; | ||
| 54 | |||
| 55 | @@ -736,6 +743,10 @@ | ||
| 56 | static const struct pci_device_id gxt4500_pci_tbl[] = { | ||
| 57 | { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT4500P), | ||
| 58 | .driver_data = GXT4500P }, | ||
| 59 | + { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT6500P), | ||
| 60 | + .driver_data = GXT6500P }, | ||
| 61 | + { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT4000P), | ||
| 62 | + .driver_data = GXT4000P }, | ||
| 63 | { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT6000P), | ||
| 64 | .driver_data = GXT6000P }, | ||
| 65 | { 0 } | ||
| 66 | @@ -768,7 +779,7 @@ | ||
| 67 | module_exit(gxt4500_exit); | ||
| 68 | |||
| 69 | MODULE_AUTHOR("Paul Mackerras <paulus@samba.org>"); | ||
| 70 | -MODULE_DESCRIPTION("FBDev driver for IBM GXT4500P/6000P"); | ||
| 71 | +MODULE_DESCRIPTION("FBDev driver for IBM GXT4500P/6500P and GXT4000P/6000P"); | ||
| 72 | MODULE_LICENSE("GPL"); | ||
| 73 | module_param(mode_option, charp, 0); | ||
| 74 | MODULE_PARM_DESC(mode_option, "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\""); |