Vincent Lejeune wrote:
git seems to have trouble sending my patch to ML atm, can you manually apply it 
? It fixes lock up here

diff --git a/src/gallium/drivers/r600/r600_asm.c 
b/src/gallium/drivers/r600/r600_asm.c
index 5f2548e..f06af44 100644
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -2961,6 +2961,6 @@ void r600_bytecode_export_read(struct 
r600_bytecode_output *output, uint32_t wor
  output->swizzle_w = G_SQ_CF_ALLOC_EXPORT_WORD1_SWIZ_SEL_W(word1);
  output->burst_count = G_SQ_CF_ALLOC_EXPORT_WORD1_BURST_COUNT(word1);
  output->end_of_program = G_SQ_CF_ALLOC_EXPORT_WORD1_END_OF_PROGRAM(word1);
-output->inst = 
EG_S_SQ_CF_ALLOC_EXPORT_WORD1_CF_INST(G_SQ_CF_ALLOC_EXPORT_WORD1_CF_INST(word1));
+output->inst = 
R600_S_SQ_CF_ALLOC_EXPORT_WORD1_CF_INST(G_SQ_CF_ALLOC_EXPORT_WORD1_CF_INST(word1));
  output->barrier = G_SQ_CF_ALLOC_EXPORT_WORD1_BARRIER(word1);
  }
--

This helps - on mesa head, demos/openarena/nexuiz run OK (nexuiz stutters a bit initially compared to R600_LLVM=0, but then I am running a debug build of llvm).

etqw now locks GPU as soon as it loads when using llvm.

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to