xf86-video-intel: Branch 'modesetting' - 2 commits - src/i830_video.c
Keith Packard
keithp at kemper.freedesktop.org
Wed Oct 4 08:03:16 EEST 2006
src/i830_video.c | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
New commits:
diff-tree cc4148e25dc226cb1365e090db21f01b77cb3cbe (from parents)
Merge: 1bc1cedbcdf6ea4d2a3e8b07b553ac50b3c126f4 3e6f81f70f65a5ba6b5c3a4e0eeaf67776a5f54d
Author: Keith Packard <keithp at neko.keithp.com>
Date: Tue Oct 3 22:00:41 2006 -0700
Merge branch 'modesetting-origin' into modesetting
diff-tree 1bc1cedbcdf6ea4d2a3e8b07b553ac50b3c126f4 (from 6ea16bf6b06c8b3aed4d2c98679ab28304d1b56c)
Author: Keith Packard <keithp at neko.keithp.com>
Date: Tue Oct 3 22:00:14 2006 -0700
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.
diff --git a/src/i830_video.c b/src/i830_video.c
index 83c032b..6a18f93 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -689,8 +689,7 @@ I830SetupImageVideoOverlay(ScreenPtr pSc
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);
@@ -698,10 +697,8 @@ I830SetupImageVideoOverlay(ScreenPtr pSc
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;
@@ -764,8 +761,7 @@ I830SetupImageVideoOverlay(ScreenPtr pSc
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");
@@ -1073,7 +1069,7 @@ I830GetPortAttribute(ScrnInfoPtr pScrn,
*value = pPriv->contrast;
} else if (attribute == xvSaturation) {
*value = pPriv->saturation;
- } else if (pI830->Clone && attribute == xvPipe) {
+ } else if (attribute == xvPipe) {
*value = pPriv->pipe;
} else if (attribute == xvGamma0 && (IS_I9XX(pI830))) {
*value = pPriv->gamma0;
More information about the xorg-commit
mailing list