linux: dwc_otg: root port and FIQ bugfixes

See: raspberrypi/linux#352 firmware: audioplus: avoid a race condition that can cause lost hdmi audio when pausing and unpausing too quickly firmware: dispmanx: Correct VC_IMAGE_TRANSFORM_T to DISPMANX_TRANFORM_T where appropriate firmware: audio: add support for arbitrary 8x8 channel mixing to be specified from host See: popcornmix/omxplayer#29
chinasaur · Aug 7, 2013 · fb15696 · fb15696
1 parent 04b5c99
commit fb15696
Show file tree

Hide file tree

Showing 40 changed files with 41,815 additions and 41,749 deletions.
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/kernel_emergency.img b/boot/kernel_emergency.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/System_emergency.map b/extra/System_emergency.map
diff --git a/extra/git_hash b/extra/git_hash
@@ -1 +1 @@
-833f70028b9db3cf830140869e073b4d82b823d5
+9b22cc2aa86e710dbd30d03a20e15006b5be8eb6
diff --git a/extra/uname_string b/extra/uname_string
@@ -1 +1 @@
-Linux version 3.6.11+ (dc4@dc4-arm-01) (gcc version 4.7.2 20120731 (prerelease) (crosstool-NG linaro-1.13.1+bzr2458 - Linaro GCC 2012.08) ) #518 PREEMPT Fri Aug 2 11:39:53 BST 2013
+Linux version 3.6.11+ (dc4@dc4-arm-01) (gcc version 4.7.2 20120731 (prerelease) (crosstool-NG linaro-1.13.1+bzr2458 - Linaro GCC 2012.08) ) #520 PREEMPT Wed Aug 7 16:07:34 BST 2013
diff --git a/hardfp/opt/vc/include/IL/OMX_Broadcom.h b/hardfp/opt/vc/include/IL/OMX_Broadcom.h
@@ -476,6 +476,21 @@ R' = coeff[1] * sample[N] + coeff[3] * sample[N+1] + coeff[5] * sample[N+2] + co
 \code{coeff} describes the downmixing coefficients
 */
 
+/* OMX_IndexConfigBrcmAudioDownmixCoefficients8x8: Audio Downmix Coefficients */
+typedef struct OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS8x8 {
+   OMX_U32 nSize;
+   OMX_VERSIONTYPE nVersion;
+   OMX_U32 nPortIndex;
+   OMX_U32 coeff[64];
+} OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS8x8;
+/*
+This config sets the platform-specific audio downmixing coefficients for the 
+audio mixer component. The coefficients are 16.16 fixed point.
+The coefficients are a 8*8 mixing matrix from 8 input channels to 8 outputs channels
+
+\code{coeff} describes the downmixing coefficients
+*/
+
 /* OMX_IndexConfigPlayMode: Play Mode */
 typedef enum OMX_PLAYMODETYPE {
    OMX_PLAYMODE_NORMAL,

diff --git a/hardfp/opt/vc/include/IL/OMX_Index.h b/hardfp/opt/vc/include/IL/OMX_Index.h
@@ -502,6 +502,7 @@ typedef enum OMX_INDEXTYPE {
 
     // 0x7f0000f0
     OMX_IndexConfigBrcmAudioDownmixCoefficients = 0x7f0000f0, /**< reference: OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS */
+    OMX_IndexConfigBrcmAudioDownmixCoefficients8x8,           /**< reference: OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS8x8 */
 
     OMX_IndexMax = 0x7FFFFFFF
 } OMX_INDEXTYPE;

diff --git a/hardfp/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Broadcom.h b/hardfp/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Broadcom.h
@@ -476,6 +476,21 @@ R' = coeff[1] * sample[N] + coeff[3] * sample[N+1] + coeff[5] * sample[N+2] + co
 \code{coeff} describes the downmixing coefficients
 */
 
+/* OMX_IndexConfigBrcmAudioDownmixCoefficients8x8: Audio Downmix Coefficients */
+typedef struct OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS8x8 {
+   OMX_U32 nSize;
+   OMX_VERSIONTYPE nVersion;
+   OMX_U32 nPortIndex;
+   OMX_U32 coeff[64];
+} OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS8x8;
+/*
+This config sets the platform-specific audio downmixing coefficients for the 
+audio mixer component. The coefficients are 16.16 fixed point.
+The coefficients are a 8*8 mixing matrix from 8 input channels to 8 outputs channels
+
+\code{coeff} describes the downmixing coefficients
+*/
+
 /* OMX_IndexConfigPlayMode: Play Mode */
 typedef enum OMX_PLAYMODETYPE {
    OMX_PLAYMODE_NORMAL,

diff --git a/hardfp/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Index.h b/hardfp/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Index.h
@@ -502,6 +502,7 @@ typedef enum OMX_INDEXTYPE {
 
     // 0x7f0000f0
     OMX_IndexConfigBrcmAudioDownmixCoefficients = 0x7f0000f0, /**< reference: OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS */
+    OMX_IndexConfigBrcmAudioDownmixCoefficients8x8,           /**< reference: OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS8x8 */
 
     OMX_IndexMax = 0x7FFFFFFF
 } OMX_INDEXTYPE;

diff --git a/hardfp/opt/vc/include/interface/vmcs_host/vc_dispmanx.h b/hardfp/opt/vc/include/interface/vmcs_host/vc_dispmanx.h
@@ -65,7 +65,7 @@ VCHPRE_ DISPMANX_DISPLAY_HANDLE_T VCHPOST_ vc_dispmanx_display_open( uint32_t de
 // Opens a display on the given device in the request mode
 VCHPRE_ DISPMANX_DISPLAY_HANDLE_T VCHPOST_ vc_dispmanx_display_open_mode( uint32_t device, uint32_t mode );
 // Open an offscreen display
-VCHPRE_ DISPMANX_DISPLAY_HANDLE_T VCHPOST_ vc_dispmanx_display_open_offscreen( DISPMANX_RESOURCE_HANDLE_T dest, VC_IMAGE_TRANSFORM_T orientation );
+VCHPRE_ DISPMANX_DISPLAY_HANDLE_T VCHPOST_ vc_dispmanx_display_open_offscreen( DISPMANX_RESOURCE_HANDLE_T dest, DISPMANX_TRANSFORM_T orientation );
 // Change the mode of a display
 VCHPRE_ int VCHPOST_ vc_dispmanx_display_reconfigure( DISPMANX_DISPLAY_HANDLE_T display, uint32_t mode );
 // Sets the desstination of the display to be the given resource
@@ -113,7 +113,7 @@ VCHPRE_ int VCHPOST_ vc_dispmanx_element_change_attributes( DISPMANX_UPDATE_HAND
                                                             const VC_RECT_T *dest_rect,
                                                             const VC_RECT_T *src_rect,
                                                             DISPMANX_RESOURCE_HANDLE_T mask,
-                                                            VC_IMAGE_TRANSFORM_T transform );
+                                                            DISPMANX_TRANSFORM_T transform );
 
 //xxx hack to get the image pointer from a resource handle, will be obsolete real soon
 VCHPRE_ uint32_t VCHPOST_ vc_dispmanx_resource_get_image_handle( DISPMANX_RESOURCE_HANDLE_T res);
@@ -123,9 +123,10 @@ VCHPRE_ void VCHPOST_ vc_vchi_dispmanx_init (VCHI_INSTANCE_T initialise_instance
 
 // Take a snapshot of a display in its current state.
 // This call may block for a time; when it completes, the snapshot is ready.
+// only transform=0 is supported
 VCHPRE_ int VCHPOST_ vc_dispmanx_snapshot( DISPMANX_DISPLAY_HANDLE_T display, 
                                            DISPMANX_RESOURCE_HANDLE_T snapshot_resource, 
-                                           VC_IMAGE_TRANSFORM_T transform );
+                                           DISPMANX_TRANSFORM_T transform );
 #ifdef __cplusplus
 }
 #endif

diff --git a/hardfp/opt/vc/include/interface/vmcs_host/vc_dispmanx_types.h b/hardfp/opt/vc/include/interface/vmcs_host/vc_dispmanx_types.h
@@ -150,7 +150,7 @@ typedef struct {
 typedef struct {
   int32_t width;
   int32_t height;
-  VC_IMAGE_TRANSFORM_T transform;
+  DISPMANX_TRANSFORM_T transform;
   DISPLAY_INPUT_FORMAT_T input_format;
 } DISPMANX_MODEINFO_T;
 

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/libopenmaxil.so b/hardfp/opt/vc/lib/libopenmaxil.so
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/opt/vc/include/IL/OMX_Broadcom.h b/opt/vc/include/IL/OMX_Broadcom.h
@@ -476,6 +476,21 @@ R' = coeff[1] * sample[N] + coeff[3] * sample[N+1] + coeff[5] * sample[N+2] + co
 \code{coeff} describes the downmixing coefficients
 */
 
+/* OMX_IndexConfigBrcmAudioDownmixCoefficients8x8: Audio Downmix Coefficients */
+typedef struct OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS8x8 {
+   OMX_U32 nSize;
+   OMX_VERSIONTYPE nVersion;
+   OMX_U32 nPortIndex;
+   OMX_U32 coeff[64];
+} OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS8x8;
+/*
+This config sets the platform-specific audio downmixing coefficients for the 
+audio mixer component. The coefficients are 16.16 fixed point.
+The coefficients are a 8*8 mixing matrix from 8 input channels to 8 outputs channels
+
+\code{coeff} describes the downmixing coefficients
+*/
+
 /* OMX_IndexConfigPlayMode: Play Mode */
 typedef enum OMX_PLAYMODETYPE {
    OMX_PLAYMODE_NORMAL,

diff --git a/opt/vc/include/IL/OMX_Index.h b/opt/vc/include/IL/OMX_Index.h
@@ -502,6 +502,7 @@ typedef enum OMX_INDEXTYPE {
 
     // 0x7f0000f0
     OMX_IndexConfigBrcmAudioDownmixCoefficients = 0x7f0000f0, /**< reference: OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS */
+    OMX_IndexConfigBrcmAudioDownmixCoefficients8x8,           /**< reference: OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS8x8 */
 
     OMX_IndexMax = 0x7FFFFFFF
 } OMX_INDEXTYPE;

diff --git a/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Broadcom.h b/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Broadcom.h
@@ -476,6 +476,21 @@ R' = coeff[1] * sample[N] + coeff[3] * sample[N+1] + coeff[5] * sample[N+2] + co
 \code{coeff} describes the downmixing coefficients
 */
 
+/* OMX_IndexConfigBrcmAudioDownmixCoefficients8x8: Audio Downmix Coefficients */
+typedef struct OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS8x8 {
+   OMX_U32 nSize;
+   OMX_VERSIONTYPE nVersion;
+   OMX_U32 nPortIndex;
+   OMX_U32 coeff[64];
+} OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS8x8;
+/*
+This config sets the platform-specific audio downmixing coefficients for the 
+audio mixer component. The coefficients are 16.16 fixed point.
+The coefficients are a 8*8 mixing matrix from 8 input channels to 8 outputs channels
+
+\code{coeff} describes the downmixing coefficients
+*/
+
 /* OMX_IndexConfigPlayMode: Play Mode */
 typedef enum OMX_PLAYMODETYPE {
    OMX_PLAYMODE_NORMAL,

diff --git a/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Index.h b/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Index.h
@@ -502,6 +502,7 @@ typedef enum OMX_INDEXTYPE {
 
     // 0x7f0000f0
     OMX_IndexConfigBrcmAudioDownmixCoefficients = 0x7f0000f0, /**< reference: OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS */
+    OMX_IndexConfigBrcmAudioDownmixCoefficients8x8,           /**< reference: OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS8x8 */
 
     OMX_IndexMax = 0x7FFFFFFF
 } OMX_INDEXTYPE;

diff --git a/opt/vc/include/interface/vmcs_host/vc_dispmanx.h b/opt/vc/include/interface/vmcs_host/vc_dispmanx.h
@@ -65,7 +65,7 @@ VCHPRE_ DISPMANX_DISPLAY_HANDLE_T VCHPOST_ vc_dispmanx_display_open( uint32_t de
 // Opens a display on the given device in the request mode
 VCHPRE_ DISPMANX_DISPLAY_HANDLE_T VCHPOST_ vc_dispmanx_display_open_mode( uint32_t device, uint32_t mode );
 // Open an offscreen display
-VCHPRE_ DISPMANX_DISPLAY_HANDLE_T VCHPOST_ vc_dispmanx_display_open_offscreen( DISPMANX_RESOURCE_HANDLE_T dest, VC_IMAGE_TRANSFORM_T orientation );
+VCHPRE_ DISPMANX_DISPLAY_HANDLE_T VCHPOST_ vc_dispmanx_display_open_offscreen( DISPMANX_RESOURCE_HANDLE_T dest, DISPMANX_TRANSFORM_T orientation );
 // Change the mode of a display
 VCHPRE_ int VCHPOST_ vc_dispmanx_display_reconfigure( DISPMANX_DISPLAY_HANDLE_T display, uint32_t mode );
 // Sets the desstination of the display to be the given resource
@@ -113,7 +113,7 @@ VCHPRE_ int VCHPOST_ vc_dispmanx_element_change_attributes( DISPMANX_UPDATE_HAND
                                                             const VC_RECT_T *dest_rect,
                                                             const VC_RECT_T *src_rect,
                                                             DISPMANX_RESOURCE_HANDLE_T mask,
-                                                            VC_IMAGE_TRANSFORM_T transform );
+                                                            DISPMANX_TRANSFORM_T transform );
 
 //xxx hack to get the image pointer from a resource handle, will be obsolete real soon
 VCHPRE_ uint32_t VCHPOST_ vc_dispmanx_resource_get_image_handle( DISPMANX_RESOURCE_HANDLE_T res);
@@ -123,9 +123,10 @@ VCHPRE_ void VCHPOST_ vc_vchi_dispmanx_init (VCHI_INSTANCE_T initialise_instance
 
 // Take a snapshot of a display in its current state.
 // This call may block for a time; when it completes, the snapshot is ready.
+// only transform=0 is supported
 VCHPRE_ int VCHPOST_ vc_dispmanx_snapshot( DISPMANX_DISPLAY_HANDLE_T display, 
                                            DISPMANX_RESOURCE_HANDLE_T snapshot_resource, 
-                                           VC_IMAGE_TRANSFORM_T transform );
+                                           DISPMANX_TRANSFORM_T transform );
 #ifdef __cplusplus
 }
 #endif

diff --git a/opt/vc/include/interface/vmcs_host/vc_dispmanx_types.h b/opt/vc/include/interface/vmcs_host/vc_dispmanx_types.h
@@ -150,7 +150,7 @@ typedef struct {
 typedef struct {
   int32_t width;
   int32_t height;
-  VC_IMAGE_TRANSFORM_T transform;
+  DISPMANX_TRANSFORM_T transform;
   DISPLAY_INPUT_FORMAT_T input_format;
 } DISPMANX_MODEINFO_T;
 

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/libopenmaxil.so b/opt/vc/lib/libopenmaxil.so
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
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		833f70028b9db3cf830140869e073b4d82b823d5
		9b22cc2aa86e710dbd30d03a20e15006b5be8eb6
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Linux version 3.6.11+ (dc4@dc4-arm-01) (gcc version 4.7.2 20120731 (prerelease) (crosstool-NG linaro-1.13.1+bzr2458 - Linaro GCC 2012.08) ) #518 PREEMPT Fri Aug 2 11:39:53 BST 2013
		Linux version 3.6.11+ (dc4@dc4-arm-01) (gcc version 4.7.2 20120731 (prerelease) (crosstool-NG linaro-1.13.1+bzr2458 - Linaro GCC 2012.08) ) #520 PREEMPT Wed Aug 7 16:07:34 BST 2013