kernel: fiq_fsm: Handle HC babble errors

See: raspberrypi/linux#588 kernel: Perform I2C combined transactions when possible See: raspberrypi/linux#318 kernel: V4L2: Increase the MMAL timeout to 3sec See: raspberrypi/linux#592 kernel: i2c-bcm2708: fixed baudrate See: raspberrypi/linux#592 firmware: Avoid calling hdcp_shutdown() when hotplug deasserted See: http://forum.stmlabs.com/showthread.php?tid=11003&pid=101848#pid101848 firmware: hello_fft: Update readme to mention use with GL See: http://www.raspberrypi.org/forums/viewtopic.php?f=68&t=76189 firmware: Clear unused pixels in the subsample image in H264 codec See: http://www.raspberrypi.org/forums/viewtopic.php?f=43&t=76845&p=551515#p551515
raspberrypi · May 16, 2014 · 97082b6 · 97082b6
1 parent c0319ac
commit 97082b6
Show file tree

Hide file tree

Showing 29 changed files with 22,073 additions and 22,027 deletions.
diff --git a/boot/bootcode.bin b/boot/bootcode.bin
diff --git a/boot/fixup.dat b/boot/fixup.dat
diff --git a/boot/fixup_cd.dat b/boot/fixup_cd.dat
diff --git a/boot/fixup_x.dat b/boot/fixup_x.dat
diff --git a/boot/kernel.img b/boot/kernel.img
diff --git a/boot/start.elf b/boot/start.elf
diff --git a/boot/start_cd.elf b/boot/start_cd.elf
diff --git a/boot/start_x.elf b/boot/start_x.elf
diff --git a/extra/System.map b/extra/System.map
diff --git a/extra/git_hash b/extra/git_hash
@@ -1 +1 @@
-c3db7205bcd8988cf7c185e50c8849542554b1f5
+4d496bf82c6e4546de64061134bb902bd64f07a7
diff --git a/extra/uname_string b/extra/uname_string
@@ -1 +1 @@
-Linux version 3.12.19+ (dc4@dc4-arm-01) (gcc version 4.7.2 20120731 (prerelease) (crosstool-NG linaro-1.13.1+bzr2458 - Linaro GCC 2012.08) ) #682 PREEMPT Mon May 12 23:27:36 BST 2014
+Linux version 3.12.19+ (dc4@dc4-arm-01) (gcc version 4.7.2 20120731 (prerelease) (crosstool-NG linaro-1.13.1+bzr2458 - Linaro GCC 2012.08) ) #684 PREEMPT Fri May 16 19:27:32 BST 2014
diff --git a/hardfp/opt/vc/lib/libEGL_static.a b/hardfp/opt/vc/lib/libEGL_static.a
diff --git a/hardfp/opt/vc/lib/libGLESv2_static.a b/hardfp/opt/vc/lib/libGLESv2_static.a
diff --git a/hardfp/opt/vc/lib/libkhrn_client.a b/hardfp/opt/vc/lib/libkhrn_client.a
diff --git a/hardfp/opt/vc/lib/libkhrn_static.a b/hardfp/opt/vc/lib/libkhrn_static.a
diff --git a/hardfp/opt/vc/lib/libvcfiled_check.a b/hardfp/opt/vc/lib/libvcfiled_check.a
diff --git a/hardfp/opt/vc/lib/libvchostif.a b/hardfp/opt/vc/lib/libvchostif.a
diff --git a/hardfp/opt/vc/lib/libvmcs_rpc_client.a b/hardfp/opt/vc/lib/libvmcs_rpc_client.a
diff --git a/hardfp/opt/vc/src/hello_pi/hello_fft/gpu_fft.txt b/hardfp/opt/vc/src/hello_pi/hello_fft/gpu_fft.txt
@@ -104,3 +104,26 @@ It accepts three optional command-line arguments: <log2_N> <batch> <loops>
 
 The special character device is required for the ioctl mailbox through which
 the ARM communicates with the Videocore GPU.
+
+
+*** With Open GL ***
+
+GPU_FFT and Open GL will run concurrently if the GPU_FFT_MEM_* defines in
+file gpu_fft.c are changed as follows:
+
+#define GPU_FFT_MEM_FLG 0x4        // cached=0xC; direct=0x4
+#define GPU_FFT_MEM_MAP 0x20000000 // cached=0x0; direct=0x20000000
+
+Overall performance will probably be higher if GPU_FFT and Open GL take turns
+at using the 3D hardware.  Since eglSwapBuffers() returns immediately without
+waiting for rendering, call glFlush() and glFinish() afterwards as follows:
+
+    for (;;) {
+        ....
+        eglSwapBuffers(....); // non-blocking call returns immediately
+        glFlush();
+        glFinish(); // wait until V3D hardware is idle
+        ....
+        gpu_fft_execute(....); // blocking call
+        ....
+    }
diff --git a/modules/3.12.19+/kernel/drivers/i2c/busses/i2c-bcm2708.ko b/modules/3.12.19+/kernel/drivers/i2c/busses/i2c-bcm2708.ko
diff --git a/modules/3.12.19+/kernel/drivers/media/platform/bcm2835/bcm2835-v4l2.ko b/modules/3.12.19+/kernel/drivers/media/platform/bcm2835/bcm2835-v4l2.ko
diff --git a/opt/vc/lib/libEGL_static.a b/opt/vc/lib/libEGL_static.a
diff --git a/opt/vc/lib/libGLESv2_static.a b/opt/vc/lib/libGLESv2_static.a
diff --git a/opt/vc/lib/libkhrn_client.a b/opt/vc/lib/libkhrn_client.a
diff --git a/opt/vc/lib/libkhrn_static.a b/opt/vc/lib/libkhrn_static.a
diff --git a/opt/vc/lib/libvcfiled_check.a b/opt/vc/lib/libvcfiled_check.a
diff --git a/opt/vc/lib/libvchostif.a b/opt/vc/lib/libvchostif.a
diff --git a/opt/vc/lib/libvmcs_rpc_client.a b/opt/vc/lib/libvmcs_rpc_client.a
diff --git a/opt/vc/src/hello_pi/hello_fft/gpu_fft.txt b/opt/vc/src/hello_pi/hello_fft/gpu_fft.txt
@@ -104,3 +104,26 @@ It accepts three optional command-line arguments: <log2_N> <batch> <loops>
 
 The special character device is required for the ioctl mailbox through which
 the ARM communicates with the Videocore GPU.
+
+
+*** With Open GL ***
+
+GPU_FFT and Open GL will run concurrently if the GPU_FFT_MEM_* defines in
+file gpu_fft.c are changed as follows:
+
+#define GPU_FFT_MEM_FLG 0x4        // cached=0xC; direct=0x4
+#define GPU_FFT_MEM_MAP 0x20000000 // cached=0x0; direct=0x20000000
+
+Overall performance will probably be higher if GPU_FFT and Open GL take turns
+at using the 3D hardware.  Since eglSwapBuffers() returns immediately without
+waiting for rendering, call glFlush() and glFinish() afterwards as follows:
+
+    for (;;) {
+        ....
+        eglSwapBuffers(....); // non-blocking call returns immediately
+        glFlush();
+        glFinish(); // wait until V3D hardware is idle
+        ....
+        gpu_fft_execute(....); // blocking call
+        ....
+    }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		c3db7205bcd8988cf7c185e50c8849542554b1f5
		4d496bf82c6e4546de64061134bb902bd64f07a7
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Linux version 3.12.19+ (dc4@dc4-arm-01) (gcc version 4.7.2 20120731 (prerelease) (crosstool-NG linaro-1.13.1+bzr2458 - Linaro GCC 2012.08) ) #682 PREEMPT Mon May 12 23:27:36 BST 2014
		Linux version 3.12.19+ (dc4@dc4-arm-01) (gcc version 4.7.2 20120731 (prerelease) (crosstool-NG linaro-1.13.1+bzr2458 - Linaro GCC 2012.08) ) #684 PREEMPT Fri May 16 19:27:32 BST 2014