big rework of TS for saa7134
PATCH RESEND v2 3/3 big rework of TS for saa7134
Hi all.
1. Add start/stop TS function.
2. Move setup DMA of TS to DMA function.
3. Write support cupture via MMAP
4. Rework startup and finish process, remove simple FSM.
linux/drivers/media/video/saa7134/saa7134-cards.c +2 -0
@@ -4495,6 +4495,7 @@/* Igor Kuznetsov <[email protected]> */ /* Andrey Melnikoff <[email protected]> */ /* Beholder Intl. Ltd. Dmitry Belimov <[email protected]> */ +/* Alexey Osipov <[email protected]> */ .name = "Beholder BeholdTV M6", .audio_clock = 0x00187de7, .tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
@@ -4569,6 +4570,7 @@/* Igor Kuznetsov <[email protected]> */ /* Andrey Melnikoff <[email protected]> */ /* Beholder Intl. Ltd. Dmitry Belimov <[email protected]> */ +/* Alexey Osipov <[email protected]> */ .name = "Beholder BeholdTV M6 Extra", .audio_clock = 0x00187de7, .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
linux/drivers/media/video/saa7134/saa7134-core.c +17 -0
@@ -380,6 +380,10 @@dprintk ("buffer_next %p\n" ,NULL );saa7134_set_dmabits (dev);del_timer (&q->timeout); + +if (card_has_mpeg (dev)) +if (dev->ts_started) +saa7134_ts_stop (dev); } }
@@ -465,6 +469,19 @@ ctrl |=SAA7134_MAIN_CTRL_TE5 ; irq |=SAA7134_IRQ1_INTE_RA2_1 |SAA7134_IRQ1_INTE_RA2_0 ; + +/* dma: setup channel 5 (= TS) */ + +saa_writeb (SAA7134_TS_DMA0 , (dev->ts.nr_packets -1 ) &0xff ); +saa_writeb (SAA7134_TS_DMA1 , + ((dev->ts.nr_packets -1 ) >>8 ) &0xff ); +/* TSNOPIT=0, TSCOLAP=0 */ +saa_writeb (SAA7134_TS_DMA2 , + (((dev->ts.nr_packets -1 ) >>16 ) &0x3f ) |0x00 ); +saa_writel (SAA7134_RS_PITCH (5 ),TS_PACKET_SIZE ); +saa_writel (SAA7134_RS_CONTROL (5 ),SAA7134_RS_CONTROL_BURST_16 | +SAA7134_RS_CONTROL_ME | + (dev->ts.pt_ts.dma >>12 )); }/* set task conditions + field handling */
linux/drivers/media/video/saa7134/saa7134-empress.c +11 -0
@@ -255,6 +255,16 @@return 0 ; } +static int empress_try_fmt_vid_cap (struct file *file,void *priv, +struct v4l2_format *f) +{ +struct saa7134_dev *dev = file->private_data; + + f->fmt.pix.pixelformat =V4L2_PIX_FMT_MPEG ; + f->fmt.pix.sizeimage =TS_PACKET_SIZE * dev->ts.nr_packets; + +return 0 ; +}static int empress_reqbufs (struct file *file,void *priv,struct v4l2_requestbuffers *p)
@@ -450,6 +460,7 @@static const struct v4l2_ioctl_ops ts_ioctl_ops = { .vidioc_querycap = empress_querycap, .vidioc_enum_fmt_vid_cap = empress_enum_fmt_vid_cap, + .vidioc_try_fmt_vid_cap = empress_try_fmt_vid_cap, .vidioc_s_fmt_vid_cap = empress_s_fmt_vid_cap, .vidioc_g_fmt_vid_cap = empress_g_fmt_vid_cap, .vidioc_reqbufs = empress_reqbufs,
linux/drivers/media/video/saa7134/saa7134-ts.c +66 -54
182 lines not on this page · raw message
linux/drivers/media/video/saa7134/saa7134.h +4 -8
@@ -498,12 +498,6 @@void (*signal_change)(struct saa7134_dev *dev); }; -enum saa7134_ts_status { -SAA7134_TS_STOPPED , -SAA7134_TS_BUFF_DONE , -SAA7134_TS_STARTED , -}; -/* global device status */ struct saa7134_dev {struct list_head devlist;
@@ -598,8 +592,7 @@/* SAA7134_MPEG_* */ struct saa7134_ts ts;struct saa7134_dmaqueue ts_q; -enum saa7134_ts_status ts_state; -unsigned int buff_cnt; +int ts_started;struct saa7134_mpeg_ops *mops;/* SAA7134_MPEG_EMPRESS only */
@@ -757,6 +750,9 @@int saa7134_ts_init_hw (struct saa7134_dev *dev); +int saa7134_ts_start (struct saa7134_dev *dev); +int saa7134_ts_stop (struct saa7134_dev *dev); +/* ----------------------------------------------------------- */ /* saa7134-vbi.c */
Signed-off-by Beholder Intl. Ltd. Dmitry Belimov <[email protected]>
Signed-off-by Alexey Osipov <[email protected]>
Tested-by Hermann Pitton <[email protected]>
With my best regards, Dmitry.
linux/drivers/media/video/saa7134/saa7134-cards.c +2 -0
@@ -4495,6 +4495,7 @@/* Igor Kuznetsov <[email protected]> */ /* Andrey Melnikoff <[email protected]> */ /* Beholder Intl. Ltd. Dmitry Belimov <[email protected]> */ +/* Alexey Osipov <[email protected]> */ .name = "Beholder BeholdTV M6", .audio_clock = 0x00187de7, .tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
@@ -4569,6 +4570,7 @@/* Igor Kuznetsov <[email protected]> */ /* Andrey Melnikoff <[email protected]> */ /* Beholder Intl. Ltd. Dmitry Belimov <[email protected]> */ +/* Alexey Osipov <[email protected]> */ .name = "Beholder BeholdTV M6 Extra", .audio_clock = 0x00187de7, .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
linux/drivers/media/video/saa7134/saa7134-core.c +17 -0
@@ -380,6 +380,10 @@dprintk ("buffer_next %p\n" ,NULL );saa7134_set_dmabits (dev);del_timer (&q->timeout); + +if (card_has_mpeg (dev)) +if (dev->ts_started) +saa7134_ts_stop (dev); } }
@@ -465,6 +469,19 @@ ctrl |=SAA7134_MAIN_CTRL_TE5 ; irq |=SAA7134_IRQ1_INTE_RA2_1 |SAA7134_IRQ1_INTE_RA2_0 ; + +/* dma: setup channel 5 (= TS) */ + +saa_writeb (SAA7134_TS_DMA0 , (dev->ts.nr_packets -1 ) &0xff ); +saa_writeb (SAA7134_TS_DMA1 , + ((dev->ts.nr_packets -1 ) >>8 ) &0xff ); +/* TSNOPIT=0, TSCOLAP=0 */ +saa_writeb (SAA7134_TS_DMA2 , + (((dev->ts.nr_packets -1 ) >>16 ) &0x3f ) |0x00 ); +saa_writel (SAA7134_RS_PITCH (5 ),TS_PACKET_SIZE ); +saa_writel (SAA7134_RS_CONTROL (5 ),SAA7134_RS_CONTROL_BURST_16 | +SAA7134_RS_CONTROL_ME | + (dev->ts.pt_ts.dma >>12 )); }/* set task conditions + field handling */
linux/drivers/media/video/saa7134/saa7134-empress.c +11 -0
@@ -255,6 +255,16 @@return 0 ; } +static int empress_try_fmt_vid_cap (struct file *file,void *priv, +struct v4l2_format *f) +{ +struct saa7134_dev *dev = file->private_data; + + f->fmt.pix.pixelformat =V4L2_PIX_FMT_MPEG ; + f->fmt.pix.sizeimage =TS_PACKET_SIZE * dev->ts.nr_packets; + +return 0 ; +}static int empress_reqbufs (struct file *file,void *priv,struct v4l2_requestbuffers *p)
@@ -450,6 +460,7 @@static const struct v4l2_ioctl_ops ts_ioctl_ops = { .vidioc_querycap = empress_querycap, .vidioc_enum_fmt_vid_cap = empress_enum_fmt_vid_cap, + .vidioc_try_fmt_vid_cap = empress_try_fmt_vid_cap, .vidioc_s_fmt_vid_cap = empress_s_fmt_vid_cap, .vidioc_g_fmt_vid_cap = empress_g_fmt_vid_cap, .vidioc_reqbufs = empress_reqbufs,
linux/drivers/media/video/saa7134/saa7134-ts.c +66 -54
182 lines not on this page · raw message
linux/drivers/media/video/saa7134/saa7134.h +4 -8
@@ -498,12 +498,6 @@void (*signal_change)(struct saa7134_dev *dev); }; -enum saa7134_ts_status { -SAA7134_TS_STOPPED , -SAA7134_TS_BUFF_DONE , -SAA7134_TS_STARTED , -}; -/* global device status */ struct saa7134_dev {struct list_head devlist;
@@ -598,8 +592,7 @@/* SAA7134_MPEG_* */ struct saa7134_ts ts;struct saa7134_dmaqueue ts_q; -enum saa7134_ts_status ts_state; -unsigned int buff_cnt; +int ts_started;struct saa7134_mpeg_ops *mops;/* SAA7134_MPEG_EMPRESS only */
@@ -757,6 +750,9 @@int saa7134_ts_init_hw (struct saa7134_dev *dev); +int saa7134_ts_start (struct saa7134_dev *dev); +int saa7134_ts_stop (struct saa7134_dev *dev); +/* ----------------------------------------------------------- */ /* saa7134-vbi.c */
Signed-off-by Beholder Intl. Ltd. Dmitry Belimov <[email protected]>
Signed-off-by Alexey Osipov <[email protected]>
Tested-by Hermann Pitton <[email protected]>