diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-10-22 19:06:06 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-10-22 19:06:06 -0200 |
| commit | 1efe36ed5cf5b0931daa915ca3ce231b78168d87 (patch) | |
| tree | 29080b36b6d9cb93bdcac1a799bbf44ca71e9067 /src/smi_driver.c | |
| parent | dd083c26de400cee8c67977f46cf90d048b22ff9 (diff) | |
Make UseFBDev option functional again.
It is mean't to be a fallback option, that as long as kernel boots
in framebuffer mode, the X Server should also work.
Correct incorrect value being checked when printing state of Dualhead
option.
The M value when programming PLL3 is actually an 8 bits integer,
so correct it and comments about it.
Diffstat (limited to 'src/smi_driver.c')
| -rw-r--r-- | src/smi_driver.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/smi_driver.c b/src/smi_driver.c index 6b8eab7..9b4d07a 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -846,6 +846,11 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) if (IS_MSOC(pSmi)) { pSmi->lcd = TRUE; pSmi->IsSecondary = FALSE; + if (pSmi->Dualhead && pSmi->UseFBDev) { + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Dual head disabled when using fbdev mode\n"); + pSmi->Dualhead = FALSE; + } } else if (SMI_LYNXM_SERIES(pSmi->Chipset)) { /* tweak options for dualhead */ @@ -870,7 +875,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) "MMIOBase=%p\n", vgaCRIndex, vgaIOBase, hwp->MMIOBase); } xf86DrvMsg(pScrn->scrnIndex, from, "Dual head %sabled\n", - pSmi->PCIBurst ? "en" : "dis"); + pSmi->Dualhead ? "en" : "dis"); SMI_MapMmio(pScrn); SMI_DetectMem(pScrn); |