Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDVO: remove ForceSDVODetect option 

Which is just a hack to hide our SDVO detect drawback,
we will have SDVO/HDMI detect fix later.
This commit is contained in:
Zhenyu Wang 2009-02-13 11:11:18 +08:00
parent ddedf19f88
commit 48445d2e93
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
man/intel.man
View File

@ -202,12 +202,6 @@ information.
Enable XvMC driver. Current support MPEG2 MC on 915/945 and G33 series.
User should provide absolute path to libIntelXvMC.so in XvMCConfig file.
Default: Disabled.
.TP
.BI "Option \*qForceSDVODetect\*q \*q" boolean \*q
Instead of depending on SDVO detect status bit to initialize SDVO outputs,
this option trys to ignore that status bit and try to probe on all SDVO
ports anyway. Try this if some output is not detected on your ADD2 card.
Use of this option will slow down your startup time. Default: Disabled.
.SH OUTPUT CONFIGURATION
On 830M and better chipsets, the driver supports runtime configuration of

3
src/i830.h
View File

@ -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;

12
src/i830_driver.c
View File

@ -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;
}