diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2006-10-03 22:00:14 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2006-10-03 22:06:10 -0700 |
| commit | 8da10d15f84ccc992b828546af5ba0d848e7263e (patch) | |
| tree | 2597bb5a6c737b03610db1fc5e651495e10a6262 /src | |
| parent | f337eea9e73cbf5c71d07df50d2e5b661a1f34cf (diff) | |
Enable XV_PORT attribute even when not in Clone mode.
As Clone mode is now something that can change after server startup, always
enable the XV_PORT attribute as we cannot change the list of reported
attributes.
(cherry picked from 1bc1cedbcdf6ea4d2a3e8b07b553ac50b3c126f4 commit)
Diffstat (limited to 'src')
| -rw-r--r-- | src/i830_video.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/i830_video.c b/src/i830_video.c index 2c357d65..0eeaccb0 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -681,8 +681,7 @@ I830SetupImageVideoOverlay(ScreenPtr pScreen) adapt->pPortPrivates[0].ptr = (pointer) (pPriv); adapt->nAttributes = NUM_ATTRIBUTES; - if (pI830->Clone) - adapt->nAttributes += CLONE_ATTRIBUTES; + adapt->nAttributes += CLONE_ATTRIBUTES; if (IS_I9XX(pI830)) adapt->nAttributes += GAMMA_ATTRIBUTES; /* has gamma */ adapt->pAttributes = xnfalloc(sizeof(XF86AttributeRec) * adapt->nAttributes); @@ -690,10 +689,8 @@ I830SetupImageVideoOverlay(ScreenPtr pScreen) att = adapt->pAttributes; memcpy((char *)att, (char*)Attributes, sizeof(XF86AttributeRec)* NUM_ATTRIBUTES); att+=NUM_ATTRIBUTES; - if (pI830->Clone) { - memcpy((char*)att, (char*)CloneAttributes, sizeof(XF86AttributeRec) * CLONE_ATTRIBUTES); - att+=CLONE_ATTRIBUTES; - } + memcpy((char*)att, (char*)CloneAttributes, sizeof(XF86AttributeRec) * CLONE_ATTRIBUTES); + att+=CLONE_ATTRIBUTES; if (IS_I9XX(pI830)) { memcpy((char*)att, (char*)GammaAttributes, sizeof(XF86AttributeRec) * GAMMA_ATTRIBUTES); att+=GAMMA_ATTRIBUTES; @@ -752,8 +749,7 @@ I830SetupImageVideoOverlay(ScreenPtr pScreen) xvDoubleBuffer = MAKE_ATOM("XV_DOUBLE_BUFFER"); /* Allow the pipe to be switched from pipe A to B when in clone mode */ - if (pI830->Clone) - xvPipe = MAKE_ATOM("XV_PIPE"); + xvPipe = MAKE_ATOM("XV_PIPE"); if (IS_I9XX(pI830)) { xvGamma0 = MAKE_ATOM("XV_GAMMA0"); @@ -1031,7 +1027,7 @@ I830GetPortAttribute(ScrnInfoPtr pScrn, *value = pPriv->brightness; } else if (attribute == xvContrast) { *value = pPriv->contrast; - } else if (pI830->Clone && attribute == xvPipe) { + } else if (attribute == xvPipe) { *value = pPriv->pipe; } else if (attribute == xvGamma0 && (IS_I9XX(pI830))) { *value = pPriv->gamma0; |