diff options
author | Ondrej Zary <linux@rainbow-software.org> | 2015-10-01 17:22:51 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-10-08 05:19:38 -0400 |
commit | 031e37f8c9c4fcfb45abc6a53bf32f4753b4dba0 (patch) | |
tree | f3dbd9028de94e75216a19291f3796cf65165fc6 | |
parent | 6a5e3bd0c8bc1025bb5092f54d5aea38216c665e (diff) |
gxt4500: enable on non-PPC architectures
These chips can be present at least on x86 too - Fire GL2 AGP has GXT6000P but
this driver is currently limited to PPC.
Enable it for all architectures and add chip configuration for little-endian.
Tested on x86 with Fire GL2 AGP.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r-- | drivers/video/fbdev/Kconfig | 5 | ||||
-rw-r--r-- | drivers/video/fbdev/gxt4500.c | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 5d67226a1cee..e6d16d65e4e6 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig | |||
@@ -2134,7 +2134,7 @@ config FB_UDL | |||
2134 | 2134 | ||
2135 | config FB_IBM_GXT4500 | 2135 | config FB_IBM_GXT4500 |
2136 | tristate "Framebuffer support for IBM GXT4000P/4500P/6000P/6500P adaptors" | 2136 | tristate "Framebuffer support for IBM GXT4000P/4500P/6000P/6500P adaptors" |
2137 | depends on FB && PPC | 2137 | depends on FB |
2138 | select FB_CFB_FILLRECT | 2138 | select FB_CFB_FILLRECT |
2139 | select FB_CFB_COPYAREA | 2139 | select FB_CFB_COPYAREA |
2140 | select FB_CFB_IMAGEBLIT | 2140 | select FB_CFB_IMAGEBLIT |
@@ -2142,7 +2142,8 @@ config FB_IBM_GXT4500 | |||
2142 | Say Y here to enable support for the IBM GXT4000P/6000P and | 2142 | Say Y here to enable support for the IBM GXT4000P/6000P and |
2143 | GXT4500P/6500P display adaptor based on Raster Engine RC1000, | 2143 | GXT4500P/6500P display adaptor based on Raster Engine RC1000, |
2144 | found on some IBM System P (pSeries) machines. This driver | 2144 | found on some IBM System P (pSeries) machines. This driver |
2145 | doesn't use Geometry Engine GT1000. | 2145 | doesn't use Geometry Engine GT1000. This driver also supports |
2146 | AGP Fire GL2/3/4 cards on x86. | ||
2146 | 2147 | ||
2147 | config FB_PS3 | 2148 | config FB_PS3 |
2148 | tristate "PS3 GPU framebuffer driver" | 2149 | tristate "PS3 GPU framebuffer driver" |
diff --git a/drivers/video/fbdev/gxt4500.c b/drivers/video/fbdev/gxt4500.c index f19133a80e8c..ae686962f3d3 100644 --- a/drivers/video/fbdev/gxt4500.c +++ b/drivers/video/fbdev/gxt4500.c | |||
@@ -670,8 +670,15 @@ static int gxt4500_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
670 | 670 | ||
671 | pci_set_drvdata(pdev, info); | 671 | pci_set_drvdata(pdev, info); |
672 | 672 | ||
673 | #ifdef __BIG_ENDIAN | ||
673 | /* Set byte-swapping for DFA aperture for all pixel sizes */ | 674 | /* Set byte-swapping for DFA aperture for all pixel sizes */ |
674 | pci_write_config_dword(pdev, CFG_ENDIAN0, 0x333300); | 675 | pci_write_config_dword(pdev, CFG_ENDIAN0, 0x333300); |
676 | #else /* __LITTLE_ENDIAN */ | ||
677 | /* not sure what this means but fgl23 driver does that */ | ||
678 | pci_write_config_dword(pdev, CFG_ENDIAN0, 0x2300); | ||
679 | /* pci_write_config_dword(pdev, CFG_ENDIAN0 + 4, 0x400000);*/ | ||
680 | pci_write_config_dword(pdev, CFG_ENDIAN0 + 8, 0x98530000); | ||
681 | #endif | ||
675 | 682 | ||
676 | info->fbops = &gxt4500_ops; | 683 | info->fbops = &gxt4500_ops; |
677 | info->flags = FBINFO_FLAG_DEFAULT; | 684 | info->flags = FBINFO_FLAG_DEFAULT; |