kernel/libs: VCHIQ: Make service closure fully synchronous

With these patches, calls to vchiq_close_service and vchiq_remove_service won't return until any associated callbacks
have been delivered to the callback thread.

firmware: video_render: Add parameter for setting the colourspace
Only applicable for non-opaque buffers

firmware: gpioman: Allow oscillator to be selected as a clock source

firmware: image_decode: huffman and quantization tables shouldn't trigger 'keep all following'
See: http://forum.stmlabs.com/showthread.php?tid=14839

userland: hello_jpeg: Fix decode fail when width/height can't be parsed from first 80K block

firmware: video_render: Fix for stereo rendering when crop height is not populated

Author: popcornmix

fixup.dat

@@ -1 +1 @@
-4ab8abbf53c043a84a6e64a1fa1f6e173ba1c168
+f03cd5e1012d3fe8314a944879308cf0f3d9e29b

fixup_cd.dat

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2012, Broadcom Europe Ltd
+Copyright (c) 2014, Broadcom Europe Ltd
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -30,11 +30,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #define VCHIQ_MAGIC              VCHIQ_MAKE_FOURCC('V', 'C', 'H', 'I')
 /* The version of VCHIQ - change with any non-trivial change */
-#define VCHIQ_VERSION            6
+#define VCHIQ_VERSION            7
 /* The minimum compatible version - update to match VCHIQ_VERSION with any
 ** incompatible change */
 #define VCHIQ_VERSION_MIN        3
 
+/* The version that introduced the VCHIQ_IOC_LIB_VERSION ioctl */
+#define VCHIQ_VERSION_LIB_VERSION 7
+
+/* The version that introduced the VCHIQ_IOC_CLOSE_DELIVERED ioctl */
+#define VCHIQ_VERSION_CLOSE_DELIVERED 7
+
 #define VCHIQ_MAX_STATES         2
 #define VCHIQ_MAX_SERVICES       4096
 #define VCHIQ_MAX_SLOTS          128

fixup_x.dat

@@ -32,25 +32,25 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "vchiq_if.h"
 
 #define VCHIQ_IOC_MAGIC 0xc4
-#define VCHIQ_INVALID_HANDLE -1
+#define VCHIQ_INVALID_HANDLE (~0)
 
 typedef struct {
    VCHIQ_SERVICE_PARAMS_T params;
    int is_open;
    int is_vchi;
-   int handle;       /* OUT */
+   unsigned int handle;       /* OUT */
 } VCHIQ_CREATE_SERVICE_T;
 
 typedef struct {
-   int handle;
-   int count;
+   unsigned int handle;
+   unsigned int count;
    const VCHIQ_ELEMENT_T *elements;
 } VCHIQ_QUEUE_MESSAGE_T;
 
 typedef struct {
-   int handle;
+   unsigned int handle;
    void *data;
-   int size;
+   unsigned int size;
    void *userdata;
    VCHIQ_BULK_MODE_T mode;
 } VCHIQ_QUEUE_BULK_TRANSFER_T;
@@ -63,27 +63,27 @@ typedef struct {
 } VCHIQ_COMPLETION_DATA_T;
 
 typedef struct {
-   int count;
+   unsigned int count;
    VCHIQ_COMPLETION_DATA_T *buf;
-   int msgbufsize;
-   int msgbufcount; /* IN/OUT */
+   unsigned int msgbufsize;
+   unsigned int msgbufcount; /* IN/OUT */
    void **msgbufs;
 } VCHIQ_AWAIT_COMPLETION_T;
 
 typedef struct {
-   int handle;
+   unsigned int handle;
    int blocking;
-   int bufsize;
+   unsigned int bufsize;
    void *buf;
 } VCHIQ_DEQUEUE_MESSAGE_T;
 
 typedef struct {
-   int config_size;
+   unsigned int config_size;
    VCHIQ_CONFIG_T *pconfig;
 } VCHIQ_GET_CONFIG_T;
 
 typedef struct {
-   int handle;
+   unsigned int handle;
    VCHIQ_SERVICE_OPTION_T option;
    int value;
 } VCHIQ_SET_SERVICE_OPTION_T;
@@ -109,6 +109,8 @@ typedef struct {
 #define VCHIQ_IOC_RELEASE_SERVICE      _IO(VCHIQ_IOC_MAGIC,   13)
 #define VCHIQ_IOC_SET_SERVICE_OPTION   _IOW(VCHIQ_IOC_MAGIC,  14, VCHIQ_SET_SERVICE_OPTION_T)
 #define VCHIQ_IOC_DUMP_PHYS_MEM        _IOW(VCHIQ_IOC_MAGIC,  15, VCHIQ_DUMP_MEM_T)
-#define VCHIQ_IOC_MAX                  15
+#define VCHIQ_IOC_LIB_VERSION          _IO(VCHIQ_IOC_MAGIC,   16)
+#define VCHIQ_IOC_CLOSE_DELIVERED      _IO(VCHIQ_IOC_MAGIC,   17)
+#define VCHIQ_IOC_MAX                  17
 
 #endif

git_hash

@@ -184,6 +184,7 @@ portSettingsChanged(OPENMAX_JPEG_DECODER * decoder)
 					     portdef.nBufferSize);
     if (ret != OMX_ErrorNone) {
 	perror("Eror allocating buffer");
+	fprintf(stderr, "OMX_AllocateBuffer returned 0x%x allocating buffer size 0x%x\n", ret, portdef.nBufferSize);
 	return OMXJPEG_ERROR_MEMORY;
     }
 
@@ -491,7 +492,7 @@ decodeImage(OPENMAX_JPEG_DECODER * decoder, char *sourceImage,
 	}
 	// wait for buffer to empty or port changed event
 	int             done = 0;
-	while ((done == 0) || (decoder->pOutputBufferHeader == NULL)) {
+	while ((done == 0) && (decoder->pOutputBufferHeader == NULL)) {
 	    if (decoder->pOutputBufferHeader == NULL) {
 		ret =
 		    ilclient_wait_for_event
@@ -500,7 +501,9 @@ decodeImage(OPENMAX_JPEG_DECODER * decoder, char *sourceImage,
 		     decoder->imageDecoder->outPort, 0, 0, 1, 0, 5);
 
 		if (ret == 0) {
-		    portSettingsChanged(decoder);
+		    ret = portSettingsChanged(decoder);
+		    if (ret != OMXJPEG_OK)
+			return ret;
 		}
 	    } else {
 		ret =
@@ -523,10 +526,7 @@ decodeImage(OPENMAX_JPEG_DECODER * decoder, char *sourceImage,
 	}
 
 	// fill the buffer if we have created the buffer
-	if (bFilled == 0) {
-	    if ((decoder->pOutputBufferHeader == NULL)) {
-		portSettingsChanged(decoder);
-	    }
+	if ((bFilled == 0) && (decoder->pOutputBufferHeader != NULL)) {
 	    ret = OMX_FillThisBuffer(decoder->imageResizer->handle,
 				     decoder->pOutputBufferHeader);
 	    if (ret != OMX_ErrorNone) {