Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b6b7543 authored by Dmitri Belimov's avatar Dmitri Belimov Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (11938): big rework of TS for saa7134 



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.

Tested-by: default avatarHermann Pitton <hermann-pitton@arcor.de>
Tested-by: default avatarBeholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
Signed-off-by: default avatarBeholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
Signed-off-by: default avatarAlexey Osipov <lion-simba@pridelands.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 028bbfed

drivers/media/video/saa7134/saa7134-cards.c

+2 −0
Original line number Diff line number Diff line
@@ -4458,6 +4458,7 @@ struct saa7134_board saa7134_boards[] = { 
		/* Igor Kuznetsov <igk@igk.ru> */

		/* Andrey Melnikoff <temnota@kmv.ru> */

		/* Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> */

		/* Alexey Osipov <lion-simba@pridelands.ru> */

		.name           = "Beholder BeholdTV M6",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
@@ -4532,6 +4533,7 @@ struct saa7134_board saa7134_boards[] = { 
		/* Igor Kuznetsov <igk@igk.ru> */

		/* Andrey Melnikoff <temnota@kmv.ru> */

		/* Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> */

		/* Alexey Osipov <lion-simba@pridelands.ru> */

		.name           = "Beholder BeholdTV M6 Extra",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */

drivers/media/video/saa7134/saa7134-core.c

+17 −0
Original line number Diff line number Diff line
@@ -331,6 +331,10 @@ void saa7134_buffer_next(struct saa7134_dev *dev, 
		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);

	}

}
@@ -416,6 +420,19 @@ int saa7134_set_dmabits(struct saa7134_dev *dev) 
		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 */

drivers/media/video/saa7134/saa7134-empress.c

+11 −0
Original line number Diff line number Diff line
@@ -255,6 +255,16 @@ static int empress_s_fmt_vid_cap(struct file *file, void *priv, 
	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_file_operations ts_fops = 
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,

drivers/media/video/saa7134/saa7134-ts.c

+66 −54
Original line number Diff line number Diff line
@@ -67,33 +67,8 @@ static int buffer_activate(struct saa7134_dev *dev, 


	mod_timer(&dev->ts_q.timeout, jiffies+TS_BUFFER_TIMEOUT);



	if (dev->ts_state == SAA7134_TS_BUFF_DONE) {

		/* Clear TS cache */

		dev->buff_cnt = 0;

		saa_writeb(SAA7134_TS_SERIAL1, 0x00);

		saa_writeb(SAA7134_TS_SERIAL1, 0x03);

		saa_writeb(SAA7134_TS_SERIAL1, 0x00);

		saa_writeb(SAA7134_TS_SERIAL1, 0x01);



		/* TS clock non-inverted */

		saa_writeb(SAA7134_TS_SERIAL1, 0x00);



		/* Start TS stream */

		switch (saa7134_boards[dev->board].ts_type) {

		case SAA7134_MPEG_TS_PARALLEL:

			saa_writeb(SAA7134_TS_SERIAL0, 0x40);

			saa_writeb(SAA7134_TS_PARALLEL, 0xec);

			break;

		case SAA7134_MPEG_TS_SERIAL:

			saa_writeb(SAA7134_TS_SERIAL0, 0xd8);

			saa_writeb(SAA7134_TS_PARALLEL, 0x6c);

			saa_writeb(SAA7134_TS_PARALLEL_SERIAL, 0xbc);

			saa_writeb(SAA7134_TS_SERIAL1, 0x02);

			break;

		}



		dev->ts_state = SAA7134_TS_STARTED;

	}

	if (!dev->ts_started)

		saa7134_ts_start(dev);



	return 0;

}
@@ -104,7 +79,6 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb, 
	struct saa7134_dev *dev = q->priv_data;

	struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);

	unsigned int lines, llength, size;

	u32 control;

	int err;



	dprintk("buffer_prepare [%p,%s]\n",buf,v4l2_field_names[field]);
@@ -121,8 +95,11 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb, 
	}



	if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {



		struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);



		dprintk("buffer_prepare: needs_init\n");



		buf->vb.width  = llength;

		buf->vb.height = lines;

		buf->vb.size   = size;
@@ -139,23 +116,6 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb, 
			goto oops;

	}



	dev->buff_cnt++;



	if (dev->buff_cnt == dev->ts.nr_bufs) {

		dev->ts_state = SAA7134_TS_BUFF_DONE;

		/* dma: setup channel 5 (= TS) */

		control = SAA7134_RS_CONTROL_BURST_16 |

			SAA7134_RS_CONTROL_ME |

			(buf->pt->dma >> 12);



		saa_writeb(SAA7134_TS_DMA0, (lines - 1) & 0xff);

		saa_writeb(SAA7134_TS_DMA1, ((lines - 1) >> 8) & 0xff);

		/* TSNOPIT=0, TSCOLAP=0 */

		saa_writeb(SAA7134_TS_DMA2, (((lines - 1) >> 16) & 0x3f) | 0x00);

		saa_writel(SAA7134_RS_PITCH(5), TS_PACKET_SIZE);

		saa_writel(SAA7134_RS_CONTROL(5), control);

	}



	buf->vb.state = VIDEOBUF_PREPARED;

	buf->activate = buffer_activate;

	buf->vb.field = field;
@@ -175,8 +135,7 @@ buffer_setup(struct videobuf_queue *q, unsigned int *count, unsigned int *size) 
	if (0 == *count)

		*count = dev->ts.nr_bufs;

	*count = saa7134_buffer_count(*size,*count);

	dev->buff_cnt = 0;

	dev->ts_state = SAA7134_TS_STOPPED;



	return 0;

}
@@ -193,11 +152,9 @@ static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb) 
	struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);

	struct saa7134_dev *dev = q->priv_data;



	if (dev->ts_state == SAA7134_TS_STARTED) {

		/* Stop TS transport */

		saa_writeb(SAA7134_TS_PARALLEL, 0x6c);

		dev->ts_state = SAA7134_TS_STOPPED;

	}

	if (dev->ts_started)

		saa7134_ts_stop(dev);



	saa7134_dma_free(q,buf);

}
@@ -214,7 +171,7 @@ EXPORT_SYMBOL_GPL(saa7134_ts_qops); 


static unsigned int tsbufs = 8;

module_param(tsbufs, int, 0444);

MODULE_PARM_DESC(tsbufs,"number of ts buffers, range 2-32");

MODULE_PARM_DESC(tsbufs, "number of ts buffers for read/write IO, range 2-32");



static unsigned int ts_nr_packets = 64;

module_param(ts_nr_packets, int, 0444);
@@ -256,6 +213,7 @@ int saa7134_ts_init1(struct saa7134_dev *dev) 
	dev->ts_q.timeout.data     = (unsigned long)(&dev->ts_q);

	dev->ts_q.dev              = dev;

	dev->ts_q.need_two         = 1;

	dev->ts_started            = 0;

	saa7134_pgtable_alloc(dev->pci,&dev->ts.pt_ts);



	/* init TS hw */
@@ -264,13 +222,67 @@ int saa7134_ts_init1(struct saa7134_dev *dev) 
	return 0;

}



/* Function for stop TS */

int saa7134_ts_stop(struct saa7134_dev *dev)

{

	dprintk("TS stop\n");



	BUG_ON(!dev->ts_started);



	/* Stop TS stream */

	switch (saa7134_boards[dev->board].ts_type) {

	case SAA7134_MPEG_TS_PARALLEL:

		saa_writeb(SAA7134_TS_PARALLEL, 0x6c);

		dev->ts_started = 0;

		break;

	case SAA7134_MPEG_TS_SERIAL:

		saa_writeb(SAA7134_TS_SERIAL0, 0x40);

		dev->ts_started = 0;

		break;

	}

	return 0;

}



/* Function for start TS */

int saa7134_ts_start(struct saa7134_dev *dev)

{

	dprintk("TS start\n");



	BUG_ON(dev->ts_started);



	saa_writeb(SAA7134_TS_SERIAL1, 0x00);

	saa_writeb(SAA7134_TS_SERIAL1, 0x03);

	saa_writeb(SAA7134_TS_SERIAL1, 0x00);

	saa_writeb(SAA7134_TS_SERIAL1, 0x01);



	/* TS clock non-inverted */

	saa_writeb(SAA7134_TS_SERIAL1, 0x00);



	/* Start TS stream */

	switch (saa7134_boards[dev->board].ts_type) {

	case SAA7134_MPEG_TS_PARALLEL:

		saa_writeb(SAA7134_TS_SERIAL0, 0x40);

		saa_writeb(SAA7134_TS_PARALLEL, 0xec);

		break;

	case SAA7134_MPEG_TS_SERIAL:

		saa_writeb(SAA7134_TS_SERIAL0, 0xd8);

		saa_writeb(SAA7134_TS_PARALLEL, 0x6c);

		saa_writeb(SAA7134_TS_PARALLEL_SERIAL, 0xbc);

		saa_writeb(SAA7134_TS_SERIAL1, 0x02);

		break;

	}



	dev->ts_started = 1;



	return 0;

}



int saa7134_ts_fini(struct saa7134_dev *dev)

{

	saa7134_pgtable_free(dev->pci,&dev->ts.pt_ts);

	return 0;

}





void saa7134_irq_ts_done(struct saa7134_dev *dev, unsigned long status)

{

	enum v4l2_field field;

drivers/media/video/saa7134/saa7134.h

+4 −8
Original line number Diff line number Diff line
@@ -493,12 +493,6 @@ struct saa7134_mpeg_ops { 
	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;
@@ -593,8 +587,7 @@ struct saa7134_dev { 
	/* 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 */
@@ -752,6 +745,9 @@ void saa7134_ts_unregister(struct saa7134_mpeg_ops *ops); 


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                                               */