In GPU code read, first wait for Phi2 being high

Change-Id: I168e7e4b5d0b44aedfb89b15ad50679223c78fbe
hoglet67 · Oct 23, 2016 · 8bb9183 · 8bb9183
1 parent 5b63223
commit 8bb9183
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/src/tubevc.c b/src/tubevc.c
@@ -6,20 +6,21 @@ unsigned char tubevc_asm[] = {
   0x00, 0x00, 0x01, 0xe8, 0x10, 0x0f, 0xc6, 0x03, 0x01, 0xc2, 0x10, 0x0f,
   0x01, 0xc2, 0x11, 0x0f, 0x01, 0xc2, 0x12, 0x0f, 0x03, 0xe8, 0x80, 0xb8,
   0x00, 0x7e, 0x04, 0x60, 0x06, 0xe8, 0x00, 0x00, 0x20, 0x7e, 0x67, 0x2d,
-  0x47, 0x6c, 0x3a, 0x18, 0x17, 0x6d, 0xfc, 0x18, 0x67, 0x2d, 0x17, 0x6d,
-  0xf9, 0x18, 0x27, 0x6d, 0x29, 0x18, 0x08, 0x60, 0x87, 0xc1, 0x10, 0x3f,
+  0x47, 0x6c, 0x3d, 0x18, 0x17, 0x6d, 0xfc, 0x18, 0x67, 0x2d, 0x17, 0x6d,
+  0xf9, 0x18, 0x27, 0x6d, 0x2c, 0x18, 0x08, 0x60, 0x87, 0xc1, 0x10, 0x3f,
   0xa8, 0xc1, 0xc1, 0x40, 0x87, 0xc1, 0x11, 0x3f, 0xa8, 0xc1, 0xc2, 0x40,
   0x87, 0xc1, 0x12, 0x3f, 0xa8, 0xc1, 0xc4, 0x40, 0x08, 0xa0, 0x08, 0x07,
   0x6d, 0x09, 0x6e, 0x31, 0x6f, 0x32, 0x68, 0x37, 0x65, 0x37, 0x67, 0x2d,
-  0x78, 0x40, 0x77, 0x6c, 0xfd, 0x18, 0x65, 0x3a, 0x69, 0x3a, 0x6a, 0x09,
-  0x6b, 0x31, 0x6c, 0x32, 0x67, 0x2d, 0x77, 0x6c, 0x7e, 0x18, 0x17, 0x6d,
-  0x83, 0x18, 0x27, 0x6d, 0x05, 0x18, 0x88, 0xc1, 0x10, 0x47, 0x89, 0x18,
-  0x4f, 0x1f, 0x67, 0x2d, 0x77, 0x6c, 0x7e, 0x18, 0x78, 0x40, 0x67, 0x2d,
-  0x77, 0x6c, 0xfd, 0x18, 0x80, 0x90, 0x0b, 0x00, 0x45, 0x1f, 0x78, 0x40,
-  0x80, 0x90, 0x07, 0x00, 0x67, 0x2d, 0x47, 0x6c, 0x7e, 0x18, 0x7f, 0x9e,
-  0xbe, 0xff, 0x18, 0x47, 0x02, 0x6a, 0x08, 0x18, 0xf8, 0x71, 0x27, 0x08,
-  0xf7, 0x6d, 0x08, 0xc2, 0xde, 0x40, 0x28, 0x09, 0x5a, 0x00, 0x48, 0x4d,
-  0x44, 0xe8, 0x00, 0x10, 0x00, 0x00, 0xe4, 0xe8, 0x00, 0xf0, 0x00, 0x00,
-  0x48, 0x7c, 0xa8, 0xc1, 0x4a, 0x47, 0x38, 0x09, 0x5a, 0x00
+  0x77, 0x6c, 0x7e, 0x18, 0x78, 0x40, 0x67, 0x2d, 0x77, 0x6c, 0xfd, 0x18,
+  0x65, 0x3a, 0x69, 0x3a, 0x6a, 0x09, 0x6b, 0x31, 0x6c, 0x32, 0x67, 0x2d,
+  0x77, 0x6c, 0x7e, 0x18, 0x17, 0x6d, 0x83, 0x18, 0x27, 0x6d, 0x05, 0x18,
+  0x88, 0xc1, 0x10, 0x47, 0x89, 0x18, 0x4c, 0x1f, 0x67, 0x2d, 0x77, 0x6c,
+  0x7e, 0x18, 0x78, 0x40, 0x67, 0x2d, 0x77, 0x6c, 0xfd, 0x18, 0x80, 0x90,
+  0x0b, 0x00, 0x42, 0x1f, 0x78, 0x40, 0x80, 0x90, 0x07, 0x00, 0x67, 0x2d,
+  0x47, 0x6c, 0x7e, 0x18, 0x7f, 0x9e, 0xbb, 0xff, 0x18, 0x47, 0x02, 0x6a,
+  0x08, 0x18, 0xf8, 0x71, 0x27, 0x08, 0xf7, 0x6d, 0x08, 0xc2, 0xde, 0x40,
+  0x28, 0x09, 0x5a, 0x00, 0x48, 0x4d, 0x44, 0xe8, 0x00, 0x10, 0x00, 0x00,
+  0xe4, 0xe8, 0x00, 0xf0, 0x00, 0x00, 0x48, 0x7c, 0xa8, 0xc1, 0x4a, 0x47,
+  0x38, 0x09, 0x5a, 0x00
 };
-unsigned int tubevc_asm_len = 262;
+unsigned int tubevc_asm_len = 268;
diff --git a/vidcore/tubevc.s b/vidcore/tubevc.s
@@ -157,16 +157,16 @@ Poll_loop:
 
    st     r5, GPSET0_offset(r6)  # DEBUG pin
 
-#  # spin waiting for clk high
-#rd_wait_for_clk_high1:
-#  ld     r7, GPLEV0_offset(r6)
-#  btst   r7, CLK
-#  beq    rd_wait_for_clk_high1
+  # spin waiting for clk high
+rd_wait_for_clk_high1:
+  ld     r7, GPLEV0_offset(r6)
+  btst   r7, CLK
+  beq    rd_wait_for_clk_high1
 
 # spin waiting for clk low
 rd_wait_for_clk_low:
-   ld     r7, GPLEV0_offset(r6)
    mov    r8, r7
+   ld     r7, GPLEV0_offset(r6)
    btst   r7, CLK
    bne    rd_wait_for_clk_low