diff options
| author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2009-02-13 11:11:18 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2009-02-13 11:11:18 +0800 |
| commit | 48445d2e939328495b4abe0fb7e579dfcef727bb (patch) | |
| tree | b32386037fd6db570065442ca19b7ebed001b16c /src | |
| parent | ddedf19f889da2ce6d69a3afce4665e2245682fa (diff) | |
SDVO: remove ForceSDVODetect option
Which is just a hack to hide our SDVO detect drawback,
we will have SDVO/HDMI detect fix later.
Diffstat (limited to 'src')
| -rw-r--r-- | src/i830.h | 3 | ||||
| -rw-r--r-- | src/i830_driver.c | 12 |
2 files changed, 2 insertions, 13 deletions
@@ -729,9 +729,6 @@ typedef struct _I830Rec { Bool debug_modes; unsigned int quirk_flag; - /* User option to ignore SDVO detect bit status, in case some outputs - not detected on SDVO, so let driver try its best. */ - Bool force_sdvo_detect; /** User option to print acceleration fallback info to the server log. */ Bool fallback_debug; } I830Rec; diff --git a/src/i830_driver.c b/src/i830_driver.c index b8d8d37f..f8219b7b 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -317,7 +317,6 @@ typedef enum { #ifdef INTEL_XVMC OPTION_XVMC, #endif - OPTION_FORCE_SDVO_DETECT, OPTION_PREFER_OVERLAY, } I830Opts; @@ -343,7 +342,6 @@ static OptionInfoRec I830Options[] = { #ifdef INTEL_XVMC {OPTION_XVMC, "XvMC", OPTV_BOOLEAN, {0}, TRUE}, #endif - {OPTION_FORCE_SDVO_DETECT, "ForceSDVODetect", OPTV_BOOLEAN, {0}, FALSE}, {OPTION_PREFER_OVERLAY, "XvPreferOverlay", OPTV_BOOLEAN, {0}, FALSE}, {-1, NULL, OPTV_NONE, {0}, FALSE} }; @@ -914,14 +912,14 @@ I830SetupOutputs(ScrnInfoPtr pScrn) i830_lvds_init(pScrn); if (IS_I9XX(pI830)) { - if ((INREG(SDVOB) & SDVO_DETECTED) || pI830->force_sdvo_detect) { + if ((INREG(SDVOB) & SDVO_DETECTED)) { Bool found = i830_sdvo_init(pScrn, SDVOB); if (!found && SUPPORTS_INTEGRATED_HDMI(pI830)) i830_hdmi_init(pScrn, SDVOB); } - if ((INREG(SDVOC) & SDVO_DETECTED) || pI830->force_sdvo_detect || + if ((INREG(SDVOC) & SDVO_DETECTED) || /* SDVOC detect bit is reserved on 965G/965GM */ (IS_I965G(pI830) && !IS_G4X(pI830))) { Bool found = i830_sdvo_init(pScrn, SDVOC); @@ -1556,12 +1554,6 @@ I830GetEarlyOptions(ScrnInfoPtr pScrn) if (xf86ReturnOptValBool(pI830->Options, OPTION_FORCEENABLEPIPEA, FALSE)) pI830->quirk_flag |= QUIRK_PIPEA_FORCE; - if (xf86ReturnOptValBool(pI830->Options, OPTION_FORCE_SDVO_DETECT, FALSE)) { - pI830->force_sdvo_detect = TRUE; - } else { - pI830->force_sdvo_detect = FALSE; - } - return TRUE; } |