diff options
| -rw-r--r-- | man/intel.man | 4 | ||||
| -rw-r--r-- | src/i830_driver.c | 28 |
2 files changed, 5 insertions, 27 deletions
diff --git a/man/intel.man b/man/intel.man index a8bf5798..b5f87915 100644 --- a/man/intel.man +++ b/man/intel.man @@ -125,10 +125,6 @@ This is the same as the option described above. It is provided for compatibility with most other drivers. .TP -.BI "Option \*qXVideo\*q \*q" boolean \*q -Disable or enable XVideo support. -Default: XVideo is enabled for configurations where it is supported. -.TP .BI "Option \*qXvPreferOverlay\*q \*q" boolean \*q Make hardware overlay be the first XV adaptor. The overlay behaves incorrectly in the presence of compositing, but some prefer diff --git a/src/i830_driver.c b/src/i830_driver.c index 60a00768..16f68dc1 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -304,7 +304,6 @@ typedef enum { OPTION_NOACCEL, OPTION_CACHE_LINES, OPTION_DRI, - OPTION_XVIDEO, OPTION_VIDEO_KEY, OPTION_COLOR_KEY, OPTION_MODEDEBUG, @@ -326,7 +325,6 @@ static OptionInfoRec I830Options[] = { {OPTION_NOACCEL, "NoAccel", OPTV_BOOLEAN, {0}, FALSE}, {OPTION_CACHE_LINES, "CacheLines", OPTV_INTEGER, {0}, FALSE}, {OPTION_DRI, "DRI", OPTV_BOOLEAN, {0}, TRUE}, - {OPTION_XVIDEO, "XVideo", OPTV_BOOLEAN, {0}, TRUE}, {OPTION_COLOR_KEY, "ColorKey", OPTV_INTEGER, {0}, FALSE}, {OPTION_VIDEO_KEY, "VideoKey", OPTV_INTEGER, {0}, FALSE}, {OPTION_MODEDEBUG, "ModeDebug", OPTV_BOOLEAN, {0}, FALSE}, @@ -1763,9 +1761,6 @@ I830XvInit(ScrnInfoPtr pScrn) I830Ptr pI830 = I830PTR(pScrn); MessageType from = X_PROBED; - pI830->XvDisabled = - !xf86ReturnOptValBool(pI830->Options, OPTION_XVIDEO, TRUE); - pI830->XvPreferOverlay = xf86ReturnOptValBool(pI830->Options, OPTION_PREFER_OVERLAY, FALSE); #ifdef I830_XV @@ -3076,7 +3071,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) * Set this so that the overlay allocation is factored in when * appropriate. */ - pI830->XvEnabled = !pI830->XvDisabled; + pI830->XvEnabled = TRUE; #endif @@ -3105,13 +3100,10 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) return FALSE; #ifdef I830_XV - pI830->XvEnabled = !pI830->XvDisabled; - if (pI830->XvEnabled) { - if (pI830->accel == ACCEL_NONE) { - xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Xv is disabled because it " - "needs 2D acceleration.\n"); - pI830->XvEnabled = FALSE; - } + if (pI830->accel == ACCEL_NONE) { + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Xv is disabled because it " + "needs 2D acceleration.\n"); + pI830->XvEnabled = FALSE; } #else pI830->XvEnabled = FALSE; @@ -3126,16 +3118,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) } } -#ifdef I830_XV - if (pI830->XvEnabled) { - if (pI830->accel == ACCEL_NONE) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Disabling Xv because it " - "needs 2D acceleration.\n"); - pI830->XvEnabled = FALSE; - } - } -#endif - if (!pI830->use_drm_mode) { DPRINTF(PFX, "assert( if(!I830MapMem(pScrn)) )\n"); if (!I830MapMem(pScrn)) |