kernel: add alternative MMC driver and support scatter/gather transfers in dmaengine

Currently disabled. Enable with bcm2708.bcm2835_mmc=1

kernel: gpio: Fix for GPIO interrupts higher than pin 32

kernel: lirc: Remove restriction on gpio pins that can be used with lirc

bcm2708_fb: Avoid dma acceleration from atomic context
See: raspberrypi/linux#663

firmware: dispmanx: Add a host call to trigger callbacks on vsync

firmware: mmal: Send port settings changed event to control port when ports are connected

firmware: image_fx: Increase max images to 31

firmware: image_fx: Add a handle to video effects so more than a single instance can be used

firmware: audio: Allow audio dither to be overridden through config.txt
enable_audio_dither=1 to force on. disable_audio_dither=1 to force off.

bootcode: Reninit sdcard after reading autoboot to allow switching partition
See: raspberrypi/noobs#195

raspicam: Add stdout flush
See: raspberrypi/userland#133

mmal: Plumb in deinterlace fast effect

Camera updates: See http://www.raspberrypi.org/forums/viewtopic.php?f=43&t=83353

Initial stereoscopic camera work. See: http://www.raspberrypi.org/forums/viewtopic.php?f=43&t=85012
Increase number of parameters permited to image effects. Some effects can now take 6 parameters, so extend IL & MMAL to match
Camera: Bug fix to reset the timestamp on stopping video capture
Fix buffer overflow in MMAL/RIL due to incorrect param type
Check size of parameters in GetParameter
OV5647: set restart_drop_frames correctly
vc_image/vc_pool: minor fixes for multichannel allocs
Amend flash API to use the driver handle. Allows two instances of the same flash driver.

Author: popcornmix

Module.symvers

@@ -1250,9 +1250,9 @@
 0x8d44f107	p9dirent_read	net/9p/9pnet	EXPORT_SYMBOL
 0x6552da66	p9_client_readdir	net/9p/9pnet	EXPORT_SYMBOL
 0x0aaebd76	v4l2_s_ctrl	drivers/media/v4l2-core/videodev	EXPORT_SYMBOL
-0x9d02d882	vchan_find_desc	drivers/dma/virt-dma	EXPORT_SYMBOL_GPL
 0x8262f64b	tcp_sockets_allocated	vmlinux	EXPORT_SYMBOL
 0xdf0daa0f	netlink_alloc_skb	vmlinux	EXPORT_SYMBOL_GPL
+0x9d02d882	vchan_find_desc	vmlinux	EXPORT_SYMBOL_GPL
 0x0ee1c6bc	inode_owner_or_capable	vmlinux	EXPORT_SYMBOL
 0xf0399da6	generic_pipe_buf_confirm	vmlinux	EXPORT_SYMBOL
 0x266c26aa	get_super_thawed	vmlinux	EXPORT_SYMBOL
@@ -1859,9 +1859,9 @@
 0x41b17ac5	tda18218_attach	drivers/media/tuners/tda18218	EXPORT_SYMBOL
 0xfe1f4c94	tda18212_attach	drivers/media/tuners/tda18212	EXPORT_SYMBOL
 0xd63f41ea	bitmap_resize	drivers/md/md-mod	EXPORT_SYMBOL_GPL
-0xb9aa5ea3	vchan_tx_submit	drivers/dma/virt-dma	EXPORT_SYMBOL_GPL
 0xc9634df9	in6addr_linklocal_allrouters	vmlinux	EXPORT_SYMBOL
 0x74dca3ec	usb_scuttle_anchored_urbs	vmlinux	EXPORT_SYMBOL_GPL
+0xb9aa5ea3	vchan_tx_submit	vmlinux	EXPORT_SYMBOL_GPL
 0xf1deabf2	div64_u64	vmlinux	EXPORT_SYMBOL
 0x798ab4a8	relay_close	vmlinux	EXPORT_SYMBOL_GPL
 0xfc39e32f	ioport_unmap	vmlinux	EXPORT_SYMBOL
@@ -3322,7 +3322,7 @@
 0x46d3b28c	__div0	vmlinux	EXPORT_SYMBOL
 0xe0fe0285	ath_hw_setbssidmask	drivers/net/wireless/ath/ath	EXPORT_SYMBOL
 0x7edaa29d	ad714x_enable	drivers/input/misc/ad714x	EXPORT_SYMBOL
-0xb27ae940	vchan_dma_desc_free_list	drivers/dma/virt-dma	EXPORT_SYMBOL_GPL
+0xb27ae940	vchan_dma_desc_free_list	vmlinux	EXPORT_SYMBOL_GPL
 0xe2aa7a97	__idr_pre_get	vmlinux	EXPORT_SYMBOL
 0x8279212c	zap_vma_ptes	vmlinux	EXPORT_SYMBOL_GPL
 0x9fe6cc0f	snd_soc_new_ac97_codec	sound/soc/snd-soc-core	EXPORT_SYMBOL_GPL
@@ -6934,11 +6934,11 @@
 0xd0f36f0d	audit_log_format	vmlinux	EXPORT_SYMBOL
 0xe1c784fd	vb2_ioctl_qbuf	drivers/media/v4l2-core/videobuf2-core	EXPORT_SYMBOL_GPL
 0x5b091a1c	serio_close	drivers/input/serio/serio	EXPORT_SYMBOL
-0x5da28926	vchan_init	drivers/dma/virt-dma	EXPORT_SYMBOL_GPL
 0x6d2fc5a6	net_namespace_list	vmlinux	EXPORT_SYMBOL_GPL
 0x4c8f1c07	sock_register	vmlinux	EXPORT_SYMBOL
 0xfdf93f9c	loop_register_transfer	vmlinux	EXPORT_SYMBOL
 0x9e12cf7e	device_set_wakeup_enable	vmlinux	EXPORT_SYMBOL_GPL
+0x5da28926	vchan_init	vmlinux	EXPORT_SYMBOL_GPL
 0xcb16f407	idr_find_slowpath	vmlinux	EXPORT_SYMBOL
 0x0e893437	lg_lock_init	vmlinux	EXPORT_SYMBOL
 0x5ce3b588	nfnl_lock	net/netfilter/nfnetlink	EXPORT_SYMBOL_GPL

bootcode.bin

@@ -1 +1 @@
-f03cd5e1012d3fe8314a944879308cf0f3d9e29b
+c37ed3586fc8b14f3dd21fa830952489e21bfa22

fixup.dat

@@ -49,7 +49,6 @@ alias wp384 wp512
 alias tgr128 tgr192
 alias tgr160 tgr192
 alias cast5 cast5_generic
-alias platform:bcm2708-dma bcm2708_dmaengine
 alias block-major-147-* drbd
 alias i2c:at24 at24
 alias i2c:24c1024 at24

fixup_cd.dat

@@ -50,6 +50,8 @@ kernel/drivers/cpufreq/cpufreq_userspace.ko
 kernel/drivers/cpufreq/cpufreq_ondemand.ko
 kernel/drivers/cpufreq/cpufreq_conservative.ko
 kernel/drivers/cpufreq/freq_table.ko
+kernel/drivers/dma/virt-dma.ko
+kernel/drivers/dma/bcm2708-dmaengine.ko
 kernel/drivers/hid/hid.ko
 kernel/drivers/hid/hid-generic.ko
 kernel/drivers/hid/usbhid/usbhid.ko
@@ -67,6 +69,7 @@ kernel/drivers/mmc/card/mmc_block.ko
 kernel/drivers/mmc/core/mmc_core.ko
 kernel/drivers/mmc/host/sdhci.ko
 kernel/drivers/mmc/host/sdhci-bcm2708.ko
+kernel/drivers/mmc/host/bcm2835-mmc.ko
 kernel/drivers/mmc/host/sdhci-pltfm.ko
 kernel/drivers/net/mii.ko
 kernel/drivers/net/usb/smsc95xx.ko

fixup_x.dat

@@ -99,8 +99,6 @@ kernel/crypto/async_tx/async_pq.ko: kernel/crypto/async_tx/async_xor.ko kernel/c
 kernel/crypto/async_tx/async_raid6_recov.ko: kernel/crypto/async_tx/async_tx.ko kernel/lib/raid6/raid6_pq.ko
 kernel/drivers/video/backlight/lcd.ko:
 kernel/drivers/video/backlight/backlight.ko:
-kernel/drivers/dma/virt-dma.ko:
-kernel/drivers/dma/bcm2708-dmaengine.ko: kernel/drivers/dma/virt-dma.ko
 kernel/drivers/char/hw_random/bcm2708-rng.ko:
 kernel/drivers/base/regmap/regmap-i2c.ko:
 kernel/drivers/base/regmap/regmap-spi.ko:

git_hash

@@ -99,8 +99,6 @@ kernel/crypto/async_tx/async_pq.ko
 kernel/crypto/async_tx/async_raid6_recov.ko
 kernel/drivers/video/backlight/lcd.ko
 kernel/drivers/video/backlight/backlight.ko
-kernel/drivers/dma/virt-dma.ko
-kernel/drivers/dma/bcm2708-dmaengine.ko
 kernel/drivers/char/hw_random/bcm2708-rng.ko
 kernel/drivers/base/regmap/regmap-i2c.ko
 kernel/drivers/base/regmap/regmap-spi.ko

kernel.img

@@ -167,7 +167,6 @@ alias symbol:dibusb_pid_filter dvb_usb_dibusb_common
 alias symbol:rt2x00queue_for_each_entry rt2x00lib
 alias symbol:ath_reg_notifier_apply ath
 alias symbol:irda_qos_bits_to_value irda
-alias symbol:vchan_tx_submit virt_dma
 alias symbol:fuse_dev_operations fuse
 alias symbol:snd_soc_dpcm_be_get_state snd_soc_core
 alias symbol:snd_soc_add_codec_controls snd_soc_core
@@ -456,7 +455,6 @@ alias symbol:v4l2_event_unsubscribe_all videodev
 alias symbol:xt_unregister_matches x_tables
 alias symbol:gf128mul_4k_lle gf128mul
 alias symbol:v9fs_unregister_trans 9pnet
-alias symbol:vchan_init virt_dma
 alias symbol:dvb_ca_en50221_camchange_irq dvb_core
 alias symbol:ssb_chipco_gpio_control ssb
 alias symbol:snd_seq_device_load_drivers snd_seq_device
@@ -544,7 +542,6 @@ alias symbol:irlmp_connect_request irda
 alias symbol:register_pppox_proto pppox
 alias symbol:snd_pcm_lib_preallocate_pages snd_pcm
 alias symbol:p9_client_lock_dotl 9pnet
-alias symbol:vchan_dma_desc_free_list virt_dma
 alias symbol:nf_ct_seq_offset nf_conntrack
 alias symbol:snd_pcm_hw_rule_noresample snd_pcm
 alias symbol:ndisc_mc_map ipv6
@@ -2603,7 +2600,6 @@ alias symbol:iscsi_eh_recover_target libiscsi
 alias symbol:ip_set_range_to_cidr ip_set
 alias symbol:generic_rndis_bind rndis_host
 alias symbol:simple_tuner_attach tuner_simple
-alias symbol:vchan_find_desc virt_dma
 alias symbol:dm_rh_start_recovery dm_region_hash
 alias symbol:snd_ac97_write_cache snd_ac97_codec
 alias symbol:ath9k_hw_wait ath9k_hw

modules/3.12.26+/kernel/drivers/dma/bcm2708-dmaengine.ko

@@ -614,7 +614,7 @@ typedef struct OMX_CONFIG_IMAGEFILTERPARAMSTYPE {
    OMX_U32 nPortIndex;
    OMX_IMAGEFILTERTYPE eImageFilter;
    OMX_U32 nNumParams;
-   OMX_U32 nParams[5];
+   OMX_U32 nParams[6];
 } OMX_CONFIG_IMAGEFILTERPARAMSTYPE;
 /*
 This structure contains optional parameters for some image
@@ -2371,5 +2371,23 @@ typedef struct OMX_CONFIG_BRCMANNOTATETYPE {
    OMX_BOOL bShowMotion;
 } OMX_CONFIG_BRCMANNOTATETYPE;
 
+typedef enum OMX_BRCMSTEREOSCOPICMODETYPE {
+   OMX_STEREOSCOPIC_NONE = 0,
+   OMX_STEREOSCOPIC_SIDEBYSIDE = 1,
+   OMX_STEREOSCOPIC_TOPBOTTOM = 2,
+   OMX_STEREOSCOPIC_MAX = 0x7FFFFFFF,
+} OMX_BRCMSTEREOSCOPICMODETYPE;
+
+typedef struct OMX_CONFIG_BRCMSTEREOSCOPICMODETYPE {
+   OMX_U32 nSize;
+   OMX_VERSIONTYPE nVersion;
+
+   OMX_U32 nPortIndex;                    /**< port that this structure applies to */
+   OMX_BRCMSTEREOSCOPICMODETYPE eMode;    /**< Packing mode */
+   OMX_BOOL bDecimate;                    /**< Half/half mode
+                                          (pixel aspect ratio = 1:2 or 2:1 if set. 1:1 if not set) */
+   OMX_BOOL bSwapEyes;                    /**< False = left eye first. True = right eye first. */
+} OMX_CONFIG_BRCMSTEREOSCOPICMODETYPE;
+
 #endif
 /* File EOF */

modules/3.12.26+/kernel/drivers/dma/virt-dma.ko

@@ -513,6 +513,7 @@ typedef enum OMX_INDEXTYPE {
     OMX_IndexParamBrcmVideoAVCInlineVectorsEnable,            /**< reference: OMX_CONFIG_PORTBOOLEANTYPE */
     OMX_IndexConfigBrcmRenderStats,                           /**< reference: OMX_CONFIG_BRCMRENDERSTATSTYPE */
     OMX_IndexConfigBrcmCameraAnnotate,                        /**< reference: OMX_CONFIG_BRCMANNOTATETYPE */
+    OMX_IndexParamBrcmStereoscopicMode,                       /**< reference :OMX_CONFIG_BRCMSTEREOSCOPICMODETYPE */
 
     OMX_IndexMax = 0x7FFFFFFF
 } OMX_INDEXTYPE;

modules/3.12.26+/kernel/drivers/staging/media/lirc/lirc_rpi.ko

@@ -130,6 +130,7 @@ enum {
    MMAL_PARAMETER_VIDEO_DENOISE,             /**< Takes a @ref MMAL_PARAMETER_BOOLEAN_T */
    MMAL_PARAMETER_STILLS_DENOISE,            /**< Takes a @ref MMAL_PARAMETER_BOOLEAN_T */
    MMAL_PARAMETER_ANNOTATE,                  /**< Takes a @ref MMAL_PARAMETER_CAMERA_ANNOTATE_T */
+   MMAL_PARAMETER_STEREOSCOPIC_MODE,         /**< Takes a @ref MMAL_PARAMETER_STEREOSCOPIC_MODE_T */
 };
 
 /** Thumbnail configuration parameter type */
@@ -248,6 +249,7 @@ typedef enum MMAL_PARAM_IMAGEFX_T
    MMAL_PARAM_IMAGEFX_CARTOON,
    MMAL_PARAM_IMAGEFX_DEINTERLACE_DOUBLE,
    MMAL_PARAM_IMAGEFX_DEINTERLACE_ADV,
+   MMAL_PARAM_IMAGEFX_DEINTERLACE_FAST,
    MMAL_PARAM_IMAGEFX_MAX = 0x7fffffff
 } MMAL_PARAM_IMAGEFX_T;
 
@@ -258,7 +260,7 @@ typedef struct MMAL_PARAMETER_IMAGEFX_T
    MMAL_PARAM_IMAGEFX_T value;   /**< Image effect mode */
 } MMAL_PARAMETER_IMAGEFX_T;
 
-#define MMAL_MAX_IMAGEFX_PARAMETERS 5  /* Image effects library currently uses a maximum of 5 parameters per effect */
+#define MMAL_MAX_IMAGEFX_PARAMETERS 6  /* Image effects library currently uses a maximum of 5 parameters per effect */
 
 typedef struct MMAL_PARAMETER_IMAGEFX_PARAMETERS_T
 {
@@ -718,4 +720,20 @@ typedef struct MMAL_PARAMETER_CAMERA_ANNOTATE_T
    MMAL_BOOL_T show_motion;
 } MMAL_PARAMETER_CAMERA_ANNOTATE_T;
 
+typedef enum MMAL_STEREOSCOPIC_MODE_T {
+   MMAL_STEREOSCOPIC_MODE_NONE = 0,
+   MMAL_STEREOSCOPIC_MODE_SIDE_BY_SIDE = 1,
+   MMAL_STEREOSCOPIC_MODE_TOP_BOTTOM = 2,
+   MMAL_STEREOSCOPIC_MODE_MAX = 0x7FFFFFFF,
+} MMAL_STEREOSCOPIC_MODE_T;
+
+typedef struct MMAL_PARAMETER_STEREOSCOPIC_MODE_T
+{
+   MMAL_PARAMETER_HEADER_T hdr;
+
+   MMAL_STEREOSCOPIC_MODE_T mode;
+   MMAL_BOOL_T decimate;
+   MMAL_BOOL_T swap_eyes;
+} MMAL_PARAMETER_STEREOSCOPIC_MODE_T;
+
 #endif  /* MMAL_PARAMETERS_CAMERA_H */

modules/3.12.26+/modules.alias

@@ -279,6 +279,8 @@ MMAL_STATUS_T mmal_port_event_get(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T **buff
 
 /* @} */
 
+MMAL_BOOL_T mmal_port_is_connected(MMAL_PORT_T *port);
+
 #ifdef __cplusplus
 }
 #endif

modules/3.12.26+/modules.alias.bin

@@ -614,7 +614,7 @@ typedef struct OMX_CONFIG_IMAGEFILTERPARAMSTYPE {
    OMX_U32 nPortIndex;
    OMX_IMAGEFILTERTYPE eImageFilter;
    OMX_U32 nNumParams;
-   OMX_U32 nParams[5];
+   OMX_U32 nParams[6];
 } OMX_CONFIG_IMAGEFILTERPARAMSTYPE;
 /*
 This structure contains optional parameters for some image
@@ -2371,5 +2371,23 @@ typedef struct OMX_CONFIG_BRCMANNOTATETYPE {
    OMX_BOOL bShowMotion;
 } OMX_CONFIG_BRCMANNOTATETYPE;
 
+typedef enum OMX_BRCMSTEREOSCOPICMODETYPE {
+   OMX_STEREOSCOPIC_NONE = 0,
+   OMX_STEREOSCOPIC_SIDEBYSIDE = 1,
+   OMX_STEREOSCOPIC_TOPBOTTOM = 2,
+   OMX_STEREOSCOPIC_MAX = 0x7FFFFFFF,
+} OMX_BRCMSTEREOSCOPICMODETYPE;
+
+typedef struct OMX_CONFIG_BRCMSTEREOSCOPICMODETYPE {
+   OMX_U32 nSize;
+   OMX_VERSIONTYPE nVersion;
+
+   OMX_U32 nPortIndex;                    /**< port that this structure applies to */
+   OMX_BRCMSTEREOSCOPICMODETYPE eMode;    /**< Packing mode */
+   OMX_BOOL bDecimate;                    /**< Half/half mode
+                                          (pixel aspect ratio = 1:2 or 2:1 if set. 1:1 if not set) */
+   OMX_BOOL bSwapEyes;                    /**< False = left eye first. True = right eye first. */
+} OMX_CONFIG_BRCMSTEREOSCOPICMODETYPE;
+
 #endif
 /* File EOF */

modules/3.12.26+/modules.builtin

@@ -513,6 +513,7 @@ typedef enum OMX_INDEXTYPE {
     OMX_IndexParamBrcmVideoAVCInlineVectorsEnable,            /**< reference: OMX_CONFIG_PORTBOOLEANTYPE */
     OMX_IndexConfigBrcmRenderStats,                           /**< reference: OMX_CONFIG_BRCMRENDERSTATSTYPE */
     OMX_IndexConfigBrcmCameraAnnotate,                        /**< reference: OMX_CONFIG_BRCMANNOTATETYPE */
+    OMX_IndexParamBrcmStereoscopicMode,                       /**< reference :OMX_CONFIG_BRCMSTEREOSCOPICMODETYPE */
 
     OMX_IndexMax = 0x7FFFFFFF
 } OMX_INDEXTYPE;

modules/3.12.26+/modules.builtin.bin

@@ -132,6 +132,9 @@ VCHPRE_ int VCHPOST_ vc_dispmanx_snapshot( DISPMANX_DISPLAY_HANDLE_T display,
 VCHPRE_ int VCHPOST_ vc_dispmanx_resource_set_palette( DISPMANX_RESOURCE_HANDLE_T handle, 
                                                       void * src_address, int offset, int size);
 
+// Start triggering callbacks synced to vsync
+VCHPRE_ int VCHPOST_ vc_dispmanx_vsync_callback( DISPMANX_DISPLAY_HANDLE_T display, DISPMANX_CALLBACK_FUNC_T cb_func, void *cb_arg );
+
 #ifdef __cplusplus
 }
 #endif