summaryrefslogtreecommitdiff
path: root/src/i830_sdvo.c
diff options
context:
space:
mode:
authorPaul Menzel <paulepanter@users.sourceforge.net>2009-06-07 22:08:05 +0200
committerPaul Menzel <paulepanter@users.sourceforge.net>2009-06-07 22:08:05 +0200
commit5cdafb61c72cfc9c0daddcb2dae9b981e8f5d8b8 (patch)
tree8acb61c61b70d126c2f2b965d5a6ac3898968fb1 /src/i830_sdvo.c
parentbe5e8111a0b6b5ff3d643bea6f8728637ae4d070 (diff)
parenta7690d9f0b9a3e0628f51635ba78117b614edf1b (diff)
downloadxf86-video-intel-frc-debian-unstable-with-frc-patches.tar.gz
xf86-video-intel-frc-debian-unstable-with-frc-patches.tar.bz2
Merge branch 'upstream-unstable' into dufdebian-unstable-with-frc-patches
Diffstat (limited to 'src/i830_sdvo.c')
-rw-r--r--src/i830_sdvo.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c
index 29ccd4e5..0e702392 100644
--- a/src/i830_sdvo.c
+++ b/src/i830_sdvo.c
@@ -1701,7 +1701,14 @@ i830_sdvo_detect(xf86OutputPtr output)
return XF86OutputStatusUnknown;
if (response == 0)
+ /*
+ * allow Xserver to run even without a CRT connected
+ */
+#if 0
return XF86OutputStatusDisconnected;
+#else
+ return XF86OutputStatusConnected;
+#endif
if (i830_sdvo_multifunc_encoder(output)) {
if (dev_priv->attached_output != response) {