xf86-video-intel: src/i830_batchbuffer.c

[Keith Packard]

 src/i830_batchbuffer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cdbf84f20295c8a78624318aa6fdfff3f5c8ce27
Author: Keith Packard <keithp at keithp.com>
Date:   Thu Jun 11 13:57:09 2009 -0700

    intel_batch_init: test have_gem, not directRenderingType
    
    Under KMS, directRenderingType will get set to DRI_NONE during driver
    initialization. When the first batch buffer is allocated, as
    directRenderingType is DRI_NONE, the GEM bufmgr would get trashed as
    intel_batch_init called a fake-bufmgr specific function.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/src/i830_batchbuffer.c b/src/i830_batchbuffer.c
index a6d9c6e..c24409b 100644
--- a/src/i830_batchbuffer.c
+++ b/src/i830_batchbuffer.c
@@ -135,7 +135,7 @@ intel_batch_init(ScrnInfoPtr pScrn)
 
     intel_next_batch(pScrn);
 
-    if (pI830->directRenderingType <= DRI_NONE) {
+    if (!pI830->have_gem) {
 	if (IS_I830(pI830) || IS_845G(pI830)) {
 	    intel_bufmgr_fake_set_exec_callback(pI830->bufmgr,
 						intel_nondrm_exec_i830,