xf86-video-ati: Branch 'master' - 3 commits
Dave Airlie
airlied at kemper.freedesktop.org
Thu Jun 19 14:51:35 PDT 2008
src/radeon_atombios.c | 7 -------
src/radeon_driver.c | 3 +--
2 files changed, 1 insertion(+), 9 deletions(-)
New commits:
commit cfe814a481d8cf2005d738a0ca9782f1ed4177f5
Author: Dave Airlie <airlied at linux.ie>
Date: Fri Jun 20 07:51:27 2008 +1000
r600: don't add fb offset here to make shadowfb work.
discovered on irc with wpwrak.
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 2516590..f18ad99 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -224,8 +224,7 @@ radeonShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode,
stride = (pScrn->displayWidth * pScrn->bitsPerPixel) / 8;
*size = stride;
- return ((uint8_t *)info->FB + pScrn->fbOffset +
- row * stride + offset);
+ return ((uint8_t *)info->FB + row * stride + offset);
}
static Bool
RADEONCreateScreenResources (ScreenPtr pScreen)
commit 5b323a2cbbc412b6dd4e782438b64ee996558d05
Merge: dd18caa... eed2415...
Author: Dave Airlie <airlied at linux.ie>
Date: Fri Jun 20 07:49:16 2008 +1000
Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-ati
commit dd18caa4b2efc430eaae0c4362b65641f9bef440
Author: Dave Airlie <airlied at linux.ie>
Date: Sat Jun 14 18:37:56 2008 +1000
Revert "ATOM: disable TV-out for now"
This reverts commit effa245914823371e052cd9aa1143a02350891e7.
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index e24697b..314bc15 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1787,13 +1787,6 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
continue;
}
#endif
-#if 1
- if (i == ATOM_DEVICE_TV1_INDEX) {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Skipping TV-Out\n");
- info->BiosConnector[i].valid = FALSE;
- continue;
- }
-#endif
info->BiosConnector[i].valid = TRUE;
info->BiosConnector[i].output_id = ci.sucI2cId.sbfAccess.bfI2C_LineMux;
More information about the xorg-commit
mailing list