diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2006-04-12 11:11:14 -0700 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2006-04-12 11:12:07 -0700 |
| commit | 59f88955f57cf0f98458b57418dae25cf53ca180 (patch) | |
| tree | 7c77bc8e8aafcec676d5af3a79dc46189ad3c28c | |
| parent | 185b5251419724fa9377421d67981daa674908c8 (diff) | |
Automatically enable clone mode if we detect two active outputs.
| -rw-r--r-- | src/i830_driver.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 5ba11085..4d29907e 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -2256,6 +2256,12 @@ I830BIOSPreInit(ScrnInfoPtr pScrn, int flags) else pI830->pipe = 1; pI830->operatingDevices = (pI830->MonType2 << 8) | pI830->MonType1; + + if (pI830->MonType1 != 0 && pI830->MonType2 != 0) { + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Enabling clone mode by default\n"); + pI830->Clone = TRUE; + } } else { I830Ptr pI8301 = I830PTR(pI830->entityPrivate->pScrn_1); pI830->operatingDevices = pI8301->operatingDevices; @@ -2296,13 +2302,6 @@ I830BIOSPreInit(ScrnInfoPtr pScrn, int flags) } if ((pI830->entityPrivate && I830IsPrimary(pScrn)) || pI830->Clone) { - if ((!xf86GetOptValString(pI830->Options, OPTION_MONITOR_LAYOUT))) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "You must have a MonitorLayout " - "defined for use in a DualHead or Clone setup.\n"); - PreInitCleanup(pScrn); - return FALSE; - } - if (pI830->MonType1 == PIPE_NONE || pI830->MonType2 == PIPE_NONE) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Monitor 1 or Monitor 2 " "cannot be type NONE in Dual or Clone setup.\n"); |