---

yaml --- r: 366834 b: refs/heads/master c: 382c31a h: refs/heads/master v: v3
git-mirror · Mar 25, 2013 · 4af2b6f · 4af2b6f
1 parent 426b5a8
commit 4af2b6f
Show file tree

Hide file tree

Showing 4 changed files with 141 additions and 380 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7eb931d635cce7b831f745c903204fb79a4aba0
+refs/heads/master: 382c31a94330a96e5800358140840998671722bf
diff --git a/trunk/drivers/staging/media/solo6x10/Kconfig b/trunk/drivers/staging/media/solo6x10/Kconfig
@@ -2,6 +2,7 @@ config SOLO6X10
 	tristate "Softlogic 6x10 MPEG codec cards"
 	depends on PCI && VIDEO_DEV && SND && I2C
 	select VIDEOBUF_DMA_SG
+	select VIDEOBUF2_DMA_SG
 	select SND_PCM
 	---help---
 	  This driver supports the Softlogic based MPEG-4 and h.264 codec

diff --git a/trunk/drivers/staging/media/solo6x10/solo6x10.h b/trunk/drivers/staging/media/solo6x10/solo6x10.h
@@ -40,6 +40,7 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-ctrls.h>
 #include <media/videobuf-core.h>
+#include <media/videobuf2-core.h>
 
 #include "registers.h"
 
@@ -135,6 +136,11 @@ struct solo_p2m_dev {
 
 #define OSD_TEXT_MAX		44
 
+struct solo_vb2_buf {
+	struct vb2_buffer vb;
+	struct list_head list;
+};
+
 enum solo_enc_types {
 	SOLO_ENC_TYPE_STD,
 	SOLO_ENC_TYPE_EXT,
@@ -146,10 +152,8 @@ struct solo_enc_dev {
 	struct v4l2_ctrl_handler hdl;
 	struct video_device	*vfd;
 	/* General accounting */
-	struct mutex		enable_lock;
+	struct mutex		lock;
 	spinlock_t		motion_lock;
-	atomic_t		readers;
-	atomic_t		mpeg_readers;
 	u8			ch;
 	u8			mode, gop, qp, interlaced, interval;
 	u8			bw_weight;
@@ -169,9 +173,8 @@ struct solo_enc_dev {
 	int			jpeg_len;
 
 	u32			fmt;
-	u8			enc_on;
 	enum solo_enc_types	type;
-	struct videobuf_queue	vidq;
+	struct vb2_queue	vidq;
 	struct list_head	vidq_active;
 	int			desc_count;
 	int			desc_nelts;