diff options
| author | Adam Jackson <ajax@redhat.com> | 2009-04-27 13:19:42 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2009-04-27 13:19:42 -0400 |
| commit | 58888aefd0bad7bfca231ec7a54865d9c26c8095 (patch) | |
| tree | 233cfe42053a57947b45be51bc72ef2df162e2f5 | |
| parent | 19c44d537e982fcf0fe2dc9f3273ac6166302510 (diff) | |
Remove a leftover from overlay support
| -rw-r--r-- | src/mga_driver.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/mga_driver.c b/src/mga_driver.c index e929311..fcb9127 100644 --- a/src/mga_driver.c +++ b/src/mga_driver.c @@ -492,7 +492,6 @@ static const OptionInfoRec MGAOptions[] = { { OPTION_SYNC_ON_GREEN, "SyncOnGreen", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_NOACCEL, "NoAccel", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_SHOWCACHE, "ShowCache", OPTV_BOOLEAN, {0}, FALSE }, - { OPTION_OVERLAY, "Overlay", OPTV_ANYSTR, {0}, FALSE }, { OPTION_MGA_SDRAM, "MGASDRAM", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_SHADOW_FB, "ShadowFB", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_FBDEV, "UseFBDev", OPTV_BOOLEAN, {0}, FALSE }, @@ -1916,17 +1915,8 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) * We support both 24bpp and 32bpp layouts, so indicate that. */ - /* Prefer 24bpp fb unless the Overlay option is set, or DRI is - * supported. - */ - flags24 = Support24bppFb | Support32bppFb | SupportConvert32to24; - s = xf86TokenToOptName(MGAOptions, OPTION_OVERLAY); -#ifndef XF86DRI - if (!(xf86FindOption(pScrn->confScreen->options, s) || - xf86FindOption(pMga->device->options, s))) { - flags24 |= PreferConvert32to24; - } -#endif + /* Prefer 32bpp */ + flags24 = Support24bppFb | Support32bppFb | PreferConvert24to32; if (pMga->SecondCrtc) flags24 = Support32bppFb; |