xf86-video-intel: src/sna/sna_driver.c

[Chris Wilson]

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

New commits:
commit 3d45f0affe263985f440e144203ed7cbb3803696
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Jul 28 18:21:08 2012 +0100

    sna: Honour the Option "DRI"
    
    References: https://bugs.freedesktop.org/show_bug.cgi?id=52624
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 3bb2315..3f2ff2e 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -508,7 +508,9 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
 	/* Set display resolution */
 	xf86SetDpi(scrn, 0, 0);
 
-	sna->dri_available = !!xf86LoadSubModule(scrn, "dri2");
+	sna->dri_available = false;
+	if (xf86ReturnOptValBool(sna->Options, OPTION_DRI, TRUE))
+		sna->dri_available = !!xf86LoadSubModule(scrn, "dri2");
 
 	return TRUE;
 }