diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-03-24 14:54:13 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-03-24 14:54:13 -0400 |
| commit | e44db96ed07ff1425a1a465ab32fd2d53a81b10c (patch) | |
| tree | e22b009b3ed49596d1641d008de12a9eb4541f3a | |
| parent | e9d517d8bd7398aa9ca33ceb64db46d659f70707 (diff) | |
Bug #10715: Fix depth configuration for alpine chips.
In particular, don't try to set up 24+32 on the chip that qemu emulates,
since it doesn't work, either in qemu or in hardware.
| -rw-r--r-- | src/alp_driver.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/alp_driver.c b/src/alp_driver.c index cf41080..c5d2426 100644 --- a/src/alp_driver.c +++ b/src/alp_driver.c @@ -528,6 +528,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) vgaHWPtr hwp; MessageType from, from1; int i; + int depth_flags; ClockRangePtr clockRanges; char *s; xf86Int10InfoPtr pInt = NULL; @@ -598,12 +599,17 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; + /* 32bpp only works on 5480 and 7548 */ + depth_flags = Support24bppFb; + if (pCir->Chipset == PCI_CHIP_GD5480 || pCir->Chipset ==PCI_CHIP_GD7548) + depth_flags |= Support32bppFb | + SupportConvert32to24 | + PreferConvert32to24; /* * The first thing we should figure out is the depth, bpp, etc. * We support both 24bpp and 32bpp layouts, so indicate that. */ - if (!xf86SetDepthBpp(pScrn, 0, 0, 24, Support24bppFb | Support32bppFb | - SupportConvert32to24 | PreferConvert32to24)) { + if (!xf86SetDepthBpp(pScrn, 0, 0, 24, depth_flags)) { return FALSE; } else { /* Check that the returned depth is one we support */ |