diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
index e9a30ef..cbb63e4 100644
--- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
@@ -86,8 +86,11 @@ intel_batchbuffer_init(struct intel_batchbuffer *batch,
          _mesa_hash_table_create(NULL, uint_key_hash, uint_key_compare);
    }
 
-   batch->use_batch_first =
-      brw->screen->kernel_features & KERNEL_ALLOWS_EXEC_BATCH_FIRST;
+   if (brw->screen)
+      batch->use_batch_first =
+         brw->screen->kernel_features & KERNEL_ALLOWS_EXEC_BATCH_FIRST;
+   else
+      batch->use_batch_first = false;
 
    intel_batchbuffer_reset(batch, bufmgr, has_llc);
 }
@@ -817,9 +820,11 @@ brw_emit_reloc(struct intel_batchbuffer *batch, uint32_t batch_offset,
 
          /* PIPECONTROL needs a w/a on gen6 */
          if (write_domain == I915_GEM_DOMAIN_INSTRUCTION) {
+#if 0
             struct brw_context *brw = container_of(batch, brw, batch);
             if (brw->gen == 6)
                entry->flags |= EXEC_OBJECT_NEEDS_GTT;
+#endif
          }
       }