From e1064f52b0ff69ea7937897b8c951cc3e32cd752 Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@FreeBSD.org>
Date: Wed, 5 Jul 2006 16:00:03 -0700
Subject: [PATCH] Don't try to probe modes on an SDVO device with NULL
 sdvo_drv.

---
 src/i830_modes.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i830_modes.c b/src/i830_modes.c
index cb505230..bb097b8c 100644
--- a/src/i830_modes.c
+++ b/src/i830_modes.c
@@ -733,7 +733,9 @@ I830ReprobePipeModeList(ScrnInfoPtr pScrn, int pipe)
 	    }
 	    break;
 	case I830_OUTPUT_SDVO:
-	    if (outputs & PIPE_DFP) {
+	    if (outputs & PIPE_DFP &&
+		pI830->output[i].sdvo_drv != NULL)
+	    {
 		output_index = i;
 	    }
 	    break;