summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-06-20 15:31:43 +1000
committerDave Airlie <airlied@redhat.com>2008-06-26 10:31:51 +1000
commitf4292e110105910d0c19bf2db28e2682b27af2c7 (patch)
tree196105950ab886ad940b989008f655d5dc5a3d43
parentbb1cfcbfbc1ace1f257fc3bf6401501f1a6da827 (diff)
Revert "Revert "ATOM: disable TV-out for now""
Oops I really didn't mean to do this, I was testing something and it slipped past. This reverts commit dd18caa4b2efc430eaae0c4362b65641f9bef440.
-rw-r--r--src/radeon_atombios.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 900e9289..20aa722c 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1787,6 +1787,13 @@ 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;