|
|
@@ -25,16 +25,11 @@
|
|
|
#include "cx25821-video.h"
|
|
|
#include "cx25821-video-upstream.h"
|
|
|
|
|
|
-#include <linux/fs.h>
|
|
|
#include <linux/errno.h>
|
|
|
#include <linux/kernel.h>
|
|
|
#include <linux/init.h>
|
|
|
#include <linux/module.h>
|
|
|
-#include <linux/syscalls.h>
|
|
|
-#include <linux/file.h>
|
|
|
-#include <linux/fcntl.h>
|
|
|
#include <linux/slab.h>
|
|
|
-#include <linux/uaccess.h>
|
|
|
|
|
|
MODULE_DESCRIPTION("v4l2 driver module for cx25821 based TV cards");
|
|
|
MODULE_AUTHOR("Hiep Huynh <hiep.huynh@conexant.com>");
|
|
|
@@ -44,7 +39,7 @@ static int _intr_msk = FLD_VID_SRC_RISC1 | FLD_VID_SRC_UF | FLD_VID_SRC_SYNC |
|
|
|
FLD_VID_SRC_OPC_ERR;
|
|
|
|
|
|
int cx25821_sram_channel_setup_upstream(struct cx25821_dev *dev,
|
|
|
- struct sram_channel *ch,
|
|
|
+ const struct sram_channel *ch,
|
|
|
unsigned int bpl, u32 risc)
|
|
|
{
|
|
|
unsigned int i, lines;
|
|
|
@@ -97,12 +92,13 @@ int cx25821_sram_channel_setup_upstream(struct cx25821_dev *dev,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static __le32 *cx25821_update_riscprogram(struct cx25821_dev *dev,
|
|
|
+static __le32 *cx25821_update_riscprogram(struct cx25821_channel *chan,
|
|
|
__le32 *rp, unsigned int offset,
|
|
|
unsigned int bpl, u32 sync_line,
|
|
|
unsigned int lines, int fifo_enable,
|
|
|
int field_type)
|
|
|
{
|
|
|
+ struct cx25821_video_out_data *out = chan->out;
|
|
|
unsigned int line, i;
|
|
|
int dist_betwn_starts = bpl * 2;
|
|
|
|
|
|
@@ -116,11 +112,11 @@ static __le32 *cx25821_update_riscprogram(struct cx25821_dev *dev,
|
|
|
/* scan lines */
|
|
|
for (line = 0; line < lines; line++) {
|
|
|
*(rp++) = cpu_to_le32(RISC_READ | RISC_SOL | RISC_EOL | bpl);
|
|
|
- *(rp++) = cpu_to_le32(dev->_data_buf_phys_addr + offset);
|
|
|
+ *(rp++) = cpu_to_le32(out->_data_buf_phys_addr + offset);
|
|
|
*(rp++) = cpu_to_le32(0); /* bits 63-32 */
|
|
|
|
|
|
if ((lines <= NTSC_FIELD_HEIGHT)
|
|
|
- || (line < (NTSC_FIELD_HEIGHT - 1)) || !(dev->_isNTSC)) {
|
|
|
+ || (line < (NTSC_FIELD_HEIGHT - 1)) || !(out->is_60hz)) {
|
|
|
offset += dist_betwn_starts;
|
|
|
}
|
|
|
}
|
|
|
@@ -128,15 +124,15 @@ static __le32 *cx25821_update_riscprogram(struct cx25821_dev *dev,
|
|
|
return rp;
|
|
|
}
|
|
|
|
|
|
-static __le32 *cx25821_risc_field_upstream(struct cx25821_dev *dev, __le32 * rp,
|
|
|
+static __le32 *cx25821_risc_field_upstream(struct cx25821_channel *chan, __le32 *rp,
|
|
|
dma_addr_t databuf_phys_addr,
|
|
|
unsigned int offset, u32 sync_line,
|
|
|
unsigned int bpl, unsigned int lines,
|
|
|
int fifo_enable, int field_type)
|
|
|
{
|
|
|
+ struct cx25821_video_out_data *out = chan->out;
|
|
|
unsigned int line, i;
|
|
|
- struct sram_channel *sram_ch =
|
|
|
- dev->channels[dev->_channel_upstream_select].sram_channels;
|
|
|
+ const struct sram_channel *sram_ch = chan->sram_channels;
|
|
|
int dist_betwn_starts = bpl * 2;
|
|
|
|
|
|
/* sync instruction */
|
|
|
@@ -155,7 +151,7 @@ static __le32 *cx25821_risc_field_upstream(struct cx25821_dev *dev, __le32 * rp,
|
|
|
*(rp++) = cpu_to_le32(0); /* bits 63-32 */
|
|
|
|
|
|
if ((lines <= NTSC_FIELD_HEIGHT)
|
|
|
- || (line < (NTSC_FIELD_HEIGHT - 1)) || !(dev->_isNTSC))
|
|
|
+ || (line < (NTSC_FIELD_HEIGHT - 1)) || !(out->is_60hz))
|
|
|
/* to skip the other field line */
|
|
|
offset += dist_betwn_starts;
|
|
|
|
|
|
@@ -173,11 +169,12 @@ static __le32 *cx25821_risc_field_upstream(struct cx25821_dev *dev, __le32 * rp,
|
|
|
return rp;
|
|
|
}
|
|
|
|
|
|
-static int cx25821_risc_buffer_upstream(struct cx25821_dev *dev,
|
|
|
+static int cx25821_risc_buffer_upstream(struct cx25821_channel *chan,
|
|
|
struct pci_dev *pci,
|
|
|
unsigned int top_offset,
|
|
|
unsigned int bpl, unsigned int lines)
|
|
|
{
|
|
|
+ struct cx25821_video_out_data *out = chan->out;
|
|
|
__le32 *rp;
|
|
|
int fifo_enable = 0;
|
|
|
/* get line count for single field */
|
|
|
@@ -191,7 +188,7 @@ static int cx25821_risc_buffer_upstream(struct cx25821_dev *dev,
|
|
|
unsigned int bottom_offset = bpl;
|
|
|
dma_addr_t risc_phys_jump_addr;
|
|
|
|
|
|
- if (dev->_isNTSC) {
|
|
|
+ if (out->is_60hz) {
|
|
|
odd_num_lines = singlefield_lines + 1;
|
|
|
risc_program_size = FRAME1_VID_PROG_SIZE;
|
|
|
frame_size = (bpl == Y411_LINE_SZ) ?
|
|
|
@@ -203,15 +200,15 @@ static int cx25821_risc_buffer_upstream(struct cx25821_dev *dev,
|
|
|
}
|
|
|
|
|
|
/* Virtual address of Risc buffer program */
|
|
|
- rp = dev->_dma_virt_addr;
|
|
|
+ rp = out->_dma_virt_addr;
|
|
|
|
|
|
for (frame = 0; frame < NUM_FRAMES; frame++) {
|
|
|
databuf_offset = frame_size * frame;
|
|
|
|
|
|
if (UNSET != top_offset) {
|
|
|
fifo_enable = (frame == 0) ? FIFO_ENABLE : FIFO_DISABLE;
|
|
|
- rp = cx25821_risc_field_upstream(dev, rp,
|
|
|
- dev->_data_buf_phys_addr +
|
|
|
+ rp = cx25821_risc_field_upstream(chan, rp,
|
|
|
+ out->_data_buf_phys_addr +
|
|
|
databuf_offset, top_offset, 0, bpl,
|
|
|
odd_num_lines, fifo_enable, ODD_FIELD);
|
|
|
}
|
|
|
@@ -219,18 +216,18 @@ static int cx25821_risc_buffer_upstream(struct cx25821_dev *dev,
|
|
|
fifo_enable = FIFO_DISABLE;
|
|
|
|
|
|
/* Even Field */
|
|
|
- rp = cx25821_risc_field_upstream(dev, rp,
|
|
|
- dev->_data_buf_phys_addr +
|
|
|
+ rp = cx25821_risc_field_upstream(chan, rp,
|
|
|
+ out->_data_buf_phys_addr +
|
|
|
databuf_offset, bottom_offset,
|
|
|
0x200, bpl, singlefield_lines,
|
|
|
fifo_enable, EVEN_FIELD);
|
|
|
|
|
|
if (frame == 0) {
|
|
|
risc_flag = RISC_CNT_RESET;
|
|
|
- risc_phys_jump_addr = dev->_dma_phys_start_addr +
|
|
|
+ risc_phys_jump_addr = out->_dma_phys_start_addr +
|
|
|
risc_program_size;
|
|
|
} else {
|
|
|
- risc_phys_jump_addr = dev->_dma_phys_start_addr;
|
|
|
+ risc_phys_jump_addr = out->_dma_phys_start_addr;
|
|
|
risc_flag = RISC_CNT_INC;
|
|
|
}
|
|
|
|
|
|
@@ -245,16 +242,21 @@ static int cx25821_risc_buffer_upstream(struct cx25821_dev *dev,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-void cx25821_stop_upstream_video_ch1(struct cx25821_dev *dev)
|
|
|
+void cx25821_stop_upstream_video(struct cx25821_channel *chan)
|
|
|
{
|
|
|
- struct sram_channel *sram_ch =
|
|
|
- dev->channels[VID_UPSTREAM_SRAM_CHANNEL_I].sram_channels;
|
|
|
+ struct cx25821_video_out_data *out = chan->out;
|
|
|
+ struct cx25821_dev *dev = chan->dev;
|
|
|
+ const struct sram_channel *sram_ch = chan->sram_channels;
|
|
|
u32 tmp = 0;
|
|
|
|
|
|
- if (!dev->_is_running) {
|
|
|
+ if (!out->_is_running) {
|
|
|
pr_info("No video file is currently running so return!\n");
|
|
|
return;
|
|
|
}
|
|
|
+
|
|
|
+ /* Set the interrupt mask register, disable irq. */
|
|
|
+ cx_set(PCI_INT_MSK, cx_read(PCI_INT_MSK) & ~(1 << sram_ch->irq_bit));
|
|
|
+
|
|
|
/* Disable RISC interrupts */
|
|
|
tmp = cx_read(sram_ch->int_msk);
|
|
|
cx_write(sram_ch->int_msk, tmp & ~_intr_msk);
|
|
|
@@ -263,283 +265,133 @@ void cx25821_stop_upstream_video_ch1(struct cx25821_dev *dev)
|
|
|
tmp = cx_read(sram_ch->dma_ctl);
|
|
|
cx_write(sram_ch->dma_ctl, tmp & ~(FLD_VID_FIFO_EN | FLD_VID_RISC_EN));
|
|
|
|
|
|
- /* Clear data buffer memory */
|
|
|
- if (dev->_data_buf_virt_addr)
|
|
|
- memset(dev->_data_buf_virt_addr, 0, dev->_data_buf_size);
|
|
|
+ free_irq(dev->pci->irq, chan);
|
|
|
|
|
|
- dev->_is_running = 0;
|
|
|
- dev->_is_first_frame = 0;
|
|
|
- dev->_frame_count = 0;
|
|
|
- dev->_file_status = END_OF_FILE;
|
|
|
-
|
|
|
- kfree(dev->_irq_queues);
|
|
|
- dev->_irq_queues = NULL;
|
|
|
+ /* Clear data buffer memory */
|
|
|
+ if (out->_data_buf_virt_addr)
|
|
|
+ memset(out->_data_buf_virt_addr, 0, out->_data_buf_size);
|
|
|
|
|
|
- kfree(dev->_filename);
|
|
|
+ out->_is_running = 0;
|
|
|
+ out->_is_first_frame = 0;
|
|
|
+ out->_frame_count = 0;
|
|
|
+ out->_file_status = END_OF_FILE;
|
|
|
|
|
|
tmp = cx_read(VID_CH_MODE_SEL);
|
|
|
cx_write(VID_CH_MODE_SEL, tmp & 0xFFFFFE00);
|
|
|
}
|
|
|
|
|
|
-void cx25821_free_mem_upstream_ch1(struct cx25821_dev *dev)
|
|
|
+void cx25821_free_mem_upstream(struct cx25821_channel *chan)
|
|
|
{
|
|
|
- if (dev->_is_running)
|
|
|
- cx25821_stop_upstream_video_ch1(dev);
|
|
|
+ struct cx25821_video_out_data *out = chan->out;
|
|
|
+ struct cx25821_dev *dev = chan->dev;
|
|
|
|
|
|
- if (dev->_dma_virt_addr) {
|
|
|
- pci_free_consistent(dev->pci, dev->_risc_size,
|
|
|
- dev->_dma_virt_addr, dev->_dma_phys_addr);
|
|
|
- dev->_dma_virt_addr = NULL;
|
|
|
+ if (out->_is_running)
|
|
|
+ cx25821_stop_upstream_video(chan);
|
|
|
+
|
|
|
+ if (out->_dma_virt_addr) {
|
|
|
+ pci_free_consistent(dev->pci, out->_risc_size,
|
|
|
+ out->_dma_virt_addr, out->_dma_phys_addr);
|
|
|
+ out->_dma_virt_addr = NULL;
|
|
|
}
|
|
|
|
|
|
- if (dev->_data_buf_virt_addr) {
|
|
|
- pci_free_consistent(dev->pci, dev->_data_buf_size,
|
|
|
- dev->_data_buf_virt_addr,
|
|
|
- dev->_data_buf_phys_addr);
|
|
|
- dev->_data_buf_virt_addr = NULL;
|
|
|
+ if (out->_data_buf_virt_addr) {
|
|
|
+ pci_free_consistent(dev->pci, out->_data_buf_size,
|
|
|
+ out->_data_buf_virt_addr,
|
|
|
+ out->_data_buf_phys_addr);
|
|
|
+ out->_data_buf_virt_addr = NULL;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-static int cx25821_get_frame(struct cx25821_dev *dev,
|
|
|
- struct sram_channel *sram_ch)
|
|
|
+int cx25821_write_frame(struct cx25821_channel *chan,
|
|
|
+ const char __user *data, size_t count)
|
|
|
{
|
|
|
- struct file *myfile;
|
|
|
- int frame_index_temp = dev->_frame_index;
|
|
|
- int i = 0;
|
|
|
- int line_size = (dev->_pixel_format == PIXEL_FRMT_411) ?
|
|
|
+ struct cx25821_video_out_data *out = chan->out;
|
|
|
+ int line_size = (out->_pixel_format == PIXEL_FRMT_411) ?
|
|
|
Y411_LINE_SZ : Y422_LINE_SZ;
|
|
|
int frame_size = 0;
|
|
|
int frame_offset = 0;
|
|
|
- ssize_t vfs_read_retval = 0;
|
|
|
- char mybuf[line_size];
|
|
|
- loff_t file_offset;
|
|
|
- loff_t pos;
|
|
|
- mm_segment_t old_fs;
|
|
|
-
|
|
|
- if (dev->_file_status == END_OF_FILE)
|
|
|
- return 0;
|
|
|
+ int curpos = out->curpos;
|
|
|
|
|
|
- if (dev->_isNTSC)
|
|
|
+ if (out->is_60hz)
|
|
|
frame_size = (line_size == Y411_LINE_SZ) ?
|
|
|
FRAME_SIZE_NTSC_Y411 : FRAME_SIZE_NTSC_Y422;
|
|
|
else
|
|
|
frame_size = (line_size == Y411_LINE_SZ) ?
|
|
|
FRAME_SIZE_PAL_Y411 : FRAME_SIZE_PAL_Y422;
|
|
|
|
|
|
- frame_offset = (frame_index_temp > 0) ? frame_size : 0;
|
|
|
- file_offset = dev->_frame_count * frame_size;
|
|
|
-
|
|
|
- myfile = filp_open(dev->_filename, O_RDONLY | O_LARGEFILE, 0);
|
|
|
-
|
|
|
- if (IS_ERR(myfile)) {
|
|
|
- const int open_errno = -PTR_ERR(myfile);
|
|
|
- pr_err("%s(): ERROR opening file(%s) with errno = %d!\n",
|
|
|
- __func__, dev->_filename, open_errno);
|
|
|
- return PTR_ERR(myfile);
|
|
|
- } else {
|
|
|
- if (!(myfile->f_op)) {
|
|
|
- pr_err("%s(): File has no file operations registered!\n",
|
|
|
- __func__);
|
|
|
- filp_close(myfile, NULL);
|
|
|
- return -EIO;
|
|
|
- }
|
|
|
-
|
|
|
- if (!myfile->f_op->read) {
|
|
|
- pr_err("%s(): File has no READ operations registered!\n",
|
|
|
- __func__);
|
|
|
- filp_close(myfile, NULL);
|
|
|
- return -EIO;
|
|
|
- }
|
|
|
-
|
|
|
- pos = myfile->f_pos;
|
|
|
- old_fs = get_fs();
|
|
|
- set_fs(KERNEL_DS);
|
|
|
-
|
|
|
- for (i = 0; i < dev->_lines_count; i++) {
|
|
|
- pos = file_offset;
|
|
|
-
|
|
|
- vfs_read_retval = vfs_read(myfile, mybuf, line_size,
|
|
|
- &pos);
|
|
|
-
|
|
|
- if (vfs_read_retval > 0 && vfs_read_retval == line_size
|
|
|
- && dev->_data_buf_virt_addr != NULL) {
|
|
|
- memcpy((void *)(dev->_data_buf_virt_addr +
|
|
|
- frame_offset / 4), mybuf,
|
|
|
- vfs_read_retval);
|
|
|
- }
|
|
|
-
|
|
|
- file_offset += vfs_read_retval;
|
|
|
- frame_offset += vfs_read_retval;
|
|
|
-
|
|
|
- if (vfs_read_retval < line_size) {
|
|
|
- pr_info("Done: exit %s() since no more bytes to read from Video file\n",
|
|
|
- __func__);
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if (i > 0)
|
|
|
- dev->_frame_count++;
|
|
|
-
|
|
|
- dev->_file_status = (vfs_read_retval == line_size) ?
|
|
|
- IN_PROGRESS : END_OF_FILE;
|
|
|
-
|
|
|
- set_fs(old_fs);
|
|
|
- filp_close(myfile, NULL);
|
|
|
- }
|
|
|
-
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
-static void cx25821_vidups_handler(struct work_struct *work)
|
|
|
-{
|
|
|
- struct cx25821_dev *dev = container_of(work, struct cx25821_dev,
|
|
|
- _irq_work_entry);
|
|
|
-
|
|
|
- if (!dev) {
|
|
|
- pr_err("ERROR %s(): since container_of(work_struct) FAILED!\n",
|
|
|
- __func__);
|
|
|
- return;
|
|
|
+ if (curpos == 0) {
|
|
|
+ out->cur_frame_index = out->_frame_index;
|
|
|
+ if (wait_event_interruptible(out->waitq, out->cur_frame_index != out->_frame_index))
|
|
|
+ return -EINTR;
|
|
|
+ out->cur_frame_index = out->_frame_index;
|
|
|
}
|
|
|
|
|
|
- cx25821_get_frame(dev, dev->channels[dev->_channel_upstream_select].
|
|
|
- sram_channels);
|
|
|
-}
|
|
|
-
|
|
|
-static int cx25821_openfile(struct cx25821_dev *dev,
|
|
|
- struct sram_channel *sram_ch)
|
|
|
-{
|
|
|
- struct file *myfile;
|
|
|
- int i = 0, j = 0;
|
|
|
- int line_size = (dev->_pixel_format == PIXEL_FRMT_411) ?
|
|
|
- Y411_LINE_SZ : Y422_LINE_SZ;
|
|
|
- ssize_t vfs_read_retval = 0;
|
|
|
- char mybuf[line_size];
|
|
|
- loff_t pos;
|
|
|
- loff_t offset = (unsigned long)0;
|
|
|
- mm_segment_t old_fs;
|
|
|
-
|
|
|
- myfile = filp_open(dev->_filename, O_RDONLY | O_LARGEFILE, 0);
|
|
|
-
|
|
|
- if (IS_ERR(myfile)) {
|
|
|
- const int open_errno = -PTR_ERR(myfile);
|
|
|
- pr_err("%s(): ERROR opening file(%s) with errno = %d!\n",
|
|
|
- __func__, dev->_filename, open_errno);
|
|
|
- return PTR_ERR(myfile);
|
|
|
- } else {
|
|
|
- if (!(myfile->f_op)) {
|
|
|
- pr_err("%s(): File has no file operations registered!\n",
|
|
|
- __func__);
|
|
|
- filp_close(myfile, NULL);
|
|
|
- return -EIO;
|
|
|
- }
|
|
|
-
|
|
|
- if (!myfile->f_op->read) {
|
|
|
- pr_err("%s(): File has no READ operations registered! Returning\n",
|
|
|
- __func__);
|
|
|
- filp_close(myfile, NULL);
|
|
|
- return -EIO;
|
|
|
- }
|
|
|
-
|
|
|
- pos = myfile->f_pos;
|
|
|
- old_fs = get_fs();
|
|
|
- set_fs(KERNEL_DS);
|
|
|
-
|
|
|
- for (j = 0; j < NUM_FRAMES; j++) {
|
|
|
- for (i = 0; i < dev->_lines_count; i++) {
|
|
|
- pos = offset;
|
|
|
-
|
|
|
- vfs_read_retval = vfs_read(myfile, mybuf,
|
|
|
- line_size, &pos);
|
|
|
-
|
|
|
- if (vfs_read_retval > 0
|
|
|
- && vfs_read_retval == line_size
|
|
|
- && dev->_data_buf_virt_addr != NULL) {
|
|
|
- memcpy((void *)(dev->
|
|
|
- _data_buf_virt_addr +
|
|
|
- offset / 4), mybuf,
|
|
|
- vfs_read_retval);
|
|
|
- }
|
|
|
-
|
|
|
- offset += vfs_read_retval;
|
|
|
-
|
|
|
- if (vfs_read_retval < line_size) {
|
|
|
- pr_info("Done: exit %s() since no more bytes to read from Video file\n",
|
|
|
- __func__);
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
+ frame_offset = out->cur_frame_index ? frame_size : 0;
|
|
|
|
|
|
- if (i > 0)
|
|
|
- dev->_frame_count++;
|
|
|
-
|
|
|
- if (vfs_read_retval < line_size)
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- dev->_file_status = (vfs_read_retval == line_size) ?
|
|
|
- IN_PROGRESS : END_OF_FILE;
|
|
|
-
|
|
|
- set_fs(old_fs);
|
|
|
- myfile->f_pos = 0;
|
|
|
- filp_close(myfile, NULL);
|
|
|
+ if (frame_size - curpos < count)
|
|
|
+ count = frame_size - curpos;
|
|
|
+ memcpy((char *)out->_data_buf_virt_addr + frame_offset + curpos,
|
|
|
+ data, count);
|
|
|
+ curpos += count;
|
|
|
+ if (curpos == frame_size) {
|
|
|
+ out->_frame_count++;
|
|
|
+ curpos = 0;
|
|
|
}
|
|
|
+ out->curpos = curpos;
|
|
|
|
|
|
- return 0;
|
|
|
+ return count;
|
|
|
}
|
|
|
|
|
|
-static int cx25821_upstream_buffer_prepare(struct cx25821_dev *dev,
|
|
|
- struct sram_channel *sram_ch,
|
|
|
+static int cx25821_upstream_buffer_prepare(struct cx25821_channel *chan,
|
|
|
+ const struct sram_channel *sram_ch,
|
|
|
int bpl)
|
|
|
{
|
|
|
+ struct cx25821_video_out_data *out = chan->out;
|
|
|
+ struct cx25821_dev *dev = chan->dev;
|
|
|
int ret = 0;
|
|
|
dma_addr_t dma_addr;
|
|
|
dma_addr_t data_dma_addr;
|
|
|
|
|
|
- if (dev->_dma_virt_addr != NULL)
|
|
|
- pci_free_consistent(dev->pci, dev->upstream_riscbuf_size,
|
|
|
- dev->_dma_virt_addr, dev->_dma_phys_addr);
|
|
|
+ if (out->_dma_virt_addr != NULL)
|
|
|
+ pci_free_consistent(dev->pci, out->upstream_riscbuf_size,
|
|
|
+ out->_dma_virt_addr, out->_dma_phys_addr);
|
|
|
|
|
|
- dev->_dma_virt_addr = pci_alloc_consistent(dev->pci,
|
|
|
- dev->upstream_riscbuf_size, &dma_addr);
|
|
|
- dev->_dma_virt_start_addr = dev->_dma_virt_addr;
|
|
|
- dev->_dma_phys_start_addr = dma_addr;
|
|
|
- dev->_dma_phys_addr = dma_addr;
|
|
|
- dev->_risc_size = dev->upstream_riscbuf_size;
|
|
|
+ out->_dma_virt_addr = pci_alloc_consistent(dev->pci,
|
|
|
+ out->upstream_riscbuf_size, &dma_addr);
|
|
|
+ out->_dma_virt_start_addr = out->_dma_virt_addr;
|
|
|
+ out->_dma_phys_start_addr = dma_addr;
|
|
|
+ out->_dma_phys_addr = dma_addr;
|
|
|
+ out->_risc_size = out->upstream_riscbuf_size;
|
|
|
|
|
|
- if (!dev->_dma_virt_addr) {
|
|
|
+ if (!out->_dma_virt_addr) {
|
|
|
pr_err("FAILED to allocate memory for Risc buffer! Returning\n");
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
|
|
|
/* Clear memory at address */
|
|
|
- memset(dev->_dma_virt_addr, 0, dev->_risc_size);
|
|
|
+ memset(out->_dma_virt_addr, 0, out->_risc_size);
|
|
|
|
|
|
- if (dev->_data_buf_virt_addr != NULL)
|
|
|
- pci_free_consistent(dev->pci, dev->upstream_databuf_size,
|
|
|
- dev->_data_buf_virt_addr,
|
|
|
- dev->_data_buf_phys_addr);
|
|
|
+ if (out->_data_buf_virt_addr != NULL)
|
|
|
+ pci_free_consistent(dev->pci, out->upstream_databuf_size,
|
|
|
+ out->_data_buf_virt_addr,
|
|
|
+ out->_data_buf_phys_addr);
|
|
|
/* For Video Data buffer allocation */
|
|
|
- dev->_data_buf_virt_addr = pci_alloc_consistent(dev->pci,
|
|
|
- dev->upstream_databuf_size, &data_dma_addr);
|
|
|
- dev->_data_buf_phys_addr = data_dma_addr;
|
|
|
- dev->_data_buf_size = dev->upstream_databuf_size;
|
|
|
+ out->_data_buf_virt_addr = pci_alloc_consistent(dev->pci,
|
|
|
+ out->upstream_databuf_size, &data_dma_addr);
|
|
|
+ out->_data_buf_phys_addr = data_dma_addr;
|
|
|
+ out->_data_buf_size = out->upstream_databuf_size;
|
|
|
|
|
|
- if (!dev->_data_buf_virt_addr) {
|
|
|
+ if (!out->_data_buf_virt_addr) {
|
|
|
pr_err("FAILED to allocate memory for data buffer! Returning\n");
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
|
|
|
/* Clear memory at address */
|
|
|
- memset(dev->_data_buf_virt_addr, 0, dev->_data_buf_size);
|
|
|
-
|
|
|
- ret = cx25821_openfile(dev, sram_ch);
|
|
|
- if (ret < 0)
|
|
|
- return ret;
|
|
|
+ memset(out->_data_buf_virt_addr, 0, out->_data_buf_size);
|
|
|
|
|
|
/* Create RISC programs */
|
|
|
- ret = cx25821_risc_buffer_upstream(dev, dev->pci, 0, bpl,
|
|
|
- dev->_lines_count);
|
|
|
+ ret = cx25821_risc_buffer_upstream(chan, dev->pci, 0, bpl,
|
|
|
+ out->_lines_count);
|
|
|
if (ret < 0) {
|
|
|
pr_info("Failed creating Video Upstream Risc programs!\n");
|
|
|
goto error;
|
|
|
@@ -551,11 +403,12 @@ error:
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-static int cx25821_video_upstream_irq(struct cx25821_dev *dev, int chan_num,
|
|
|
- u32 status)
|
|
|
+static int cx25821_video_upstream_irq(struct cx25821_channel *chan, u32 status)
|
|
|
{
|
|
|
+ struct cx25821_video_out_data *out = chan->out;
|
|
|
+ struct cx25821_dev *dev = chan->dev;
|
|
|
u32 int_msk_tmp;
|
|
|
- struct sram_channel *channel = dev->channels[chan_num].sram_channels;
|
|
|
+ const struct sram_channel *channel = chan->sram_channels;
|
|
|
int singlefield_lines = NTSC_FIELD_HEIGHT;
|
|
|
int line_size_in_bytes = Y422_LINE_SZ;
|
|
|
int odd_risc_prog_size = 0;
|
|
|
@@ -572,16 +425,16 @@ static int cx25821_video_upstream_irq(struct cx25821_dev *dev, int chan_num,
|
|
|
cx_write(channel->int_msk, int_msk_tmp & ~_intr_msk);
|
|
|
cx_write(channel->int_stat, _intr_msk);
|
|
|
|
|
|
- spin_lock(&dev->slock);
|
|
|
+ wake_up(&out->waitq);
|
|
|
|
|
|
- dev->_frame_index = prog_cnt;
|
|
|
+ spin_lock(&dev->slock);
|
|
|
|
|
|
- queue_work(dev->_irq_queues, &dev->_irq_work_entry);
|
|
|
+ out->_frame_index = prog_cnt;
|
|
|
|
|
|
- if (dev->_is_first_frame) {
|
|
|
- dev->_is_first_frame = 0;
|
|
|
+ if (out->_is_first_frame) {
|
|
|
+ out->_is_first_frame = 0;
|
|
|
|
|
|
- if (dev->_isNTSC) {
|
|
|
+ if (out->is_60hz) {
|
|
|
singlefield_lines += 1;
|
|
|
odd_risc_prog_size = ODD_FLD_NTSC_PROG_SIZE;
|
|
|
} else {
|
|
|
@@ -589,17 +442,17 @@ static int cx25821_video_upstream_irq(struct cx25821_dev *dev, int chan_num,
|
|
|
odd_risc_prog_size = ODD_FLD_PAL_PROG_SIZE;
|
|
|
}
|
|
|
|
|
|
- if (dev->_dma_virt_start_addr != NULL) {
|
|
|
+ if (out->_dma_virt_start_addr != NULL) {
|
|
|
line_size_in_bytes =
|
|
|
- (dev->_pixel_format ==
|
|
|
+ (out->_pixel_format ==
|
|
|
PIXEL_FRMT_411) ? Y411_LINE_SZ :
|
|
|
Y422_LINE_SZ;
|
|
|
risc_phys_jump_addr =
|
|
|
- dev->_dma_phys_start_addr +
|
|
|
+ out->_dma_phys_start_addr +
|
|
|
odd_risc_prog_size;
|
|
|
|
|
|
- rp = cx25821_update_riscprogram(dev,
|
|
|
- dev->_dma_virt_start_addr, TOP_OFFSET,
|
|
|
+ rp = cx25821_update_riscprogram(chan,
|
|
|
+ out->_dma_virt_start_addr, TOP_OFFSET,
|
|
|
line_size_in_bytes, 0x0,
|
|
|
singlefield_lines, FIFO_DISABLE,
|
|
|
ODD_FIELD);
|
|
|
@@ -626,8 +479,8 @@ static int cx25821_video_upstream_irq(struct cx25821_dev *dev, int chan_num,
|
|
|
__func__);
|
|
|
}
|
|
|
|
|
|
- if (dev->_file_status == END_OF_FILE) {
|
|
|
- pr_err("EOF Channel 1 Framecount = %d\n", dev->_frame_count);
|
|
|
+ if (out->_file_status == END_OF_FILE) {
|
|
|
+ pr_err("EOF Channel 1 Framecount = %d\n", out->_frame_count);
|
|
|
return -1;
|
|
|
}
|
|
|
/* ElSE, set the interrupt mask register, re-enable irq. */
|
|
|
@@ -639,47 +492,41 @@ static int cx25821_video_upstream_irq(struct cx25821_dev *dev, int chan_num,
|
|
|
|
|
|
static irqreturn_t cx25821_upstream_irq(int irq, void *dev_id)
|
|
|
{
|
|
|
- struct cx25821_dev *dev = dev_id;
|
|
|
+ struct cx25821_channel *chan = dev_id;
|
|
|
+ struct cx25821_dev *dev = chan->dev;
|
|
|
u32 vid_status;
|
|
|
int handled = 0;
|
|
|
- int channel_num = 0;
|
|
|
- struct sram_channel *sram_ch;
|
|
|
+ const struct sram_channel *sram_ch;
|
|
|
|
|
|
if (!dev)
|
|
|
return -1;
|
|
|
|
|
|
- channel_num = VID_UPSTREAM_SRAM_CHANNEL_I;
|
|
|
-
|
|
|
- sram_ch = dev->channels[channel_num].sram_channels;
|
|
|
+ sram_ch = chan->sram_channels;
|
|
|
|
|
|
vid_status = cx_read(sram_ch->int_stat);
|
|
|
|
|
|
/* Only deal with our interrupt */
|
|
|
if (vid_status)
|
|
|
- handled = cx25821_video_upstream_irq(dev, channel_num,
|
|
|
- vid_status);
|
|
|
-
|
|
|
- if (handled < 0)
|
|
|
- cx25821_stop_upstream_video_ch1(dev);
|
|
|
- else
|
|
|
- handled += handled;
|
|
|
+ handled = cx25821_video_upstream_irq(chan, vid_status);
|
|
|
|
|
|
return IRQ_RETVAL(handled);
|
|
|
}
|
|
|
|
|
|
-static void cx25821_set_pixelengine(struct cx25821_dev *dev,
|
|
|
- struct sram_channel *ch,
|
|
|
+static void cx25821_set_pixelengine(struct cx25821_channel *chan,
|
|
|
+ const struct sram_channel *ch,
|
|
|
int pix_format)
|
|
|
{
|
|
|
+ struct cx25821_video_out_data *out = chan->out;
|
|
|
+ struct cx25821_dev *dev = chan->dev;
|
|
|
int width = WIDTH_D1;
|
|
|
- int height = dev->_lines_count;
|
|
|
+ int height = out->_lines_count;
|
|
|
int num_lines, odd_num_lines;
|
|
|
u32 value;
|
|
|
int vip_mode = OUTPUT_FRMT_656;
|
|
|
|
|
|
value = ((pix_format & 0x3) << 12) | (vip_mode & 0x7);
|
|
|
value &= 0xFFFFFFEF;
|
|
|
- value |= dev->_isNTSC ? 0 : 0x10;
|
|
|
+ value |= out->is_60hz ? 0 : 0x10;
|
|
|
cx_write(ch->vid_fmt_ctl, value);
|
|
|
|
|
|
/* set number of active pixels in each line.
|
|
|
@@ -689,7 +536,7 @@ static void cx25821_set_pixelengine(struct cx25821_dev *dev,
|
|
|
num_lines = (height / 2) & 0x3FF;
|
|
|
odd_num_lines = num_lines;
|
|
|
|
|
|
- if (dev->_isNTSC)
|
|
|
+ if (out->is_60hz)
|
|
|
odd_num_lines += 1;
|
|
|
|
|
|
value = (num_lines << 16) | odd_num_lines;
|
|
|
@@ -700,9 +547,11 @@ static void cx25821_set_pixelengine(struct cx25821_dev *dev,
|
|
|
cx_write(ch->vid_cdt_size, VID_CDT_SIZE >> 3);
|
|
|
}
|
|
|
|
|
|
-static int cx25821_start_video_dma_upstream(struct cx25821_dev *dev,
|
|
|
- struct sram_channel *sram_ch)
|
|
|
+static int cx25821_start_video_dma_upstream(struct cx25821_channel *chan,
|
|
|
+ const struct sram_channel *sram_ch)
|
|
|
{
|
|
|
+ struct cx25821_video_out_data *out = chan->out;
|
|
|
+ struct cx25821_dev *dev = chan->dev;
|
|
|
u32 tmp = 0;
|
|
|
int err = 0;
|
|
|
|
|
|
@@ -715,7 +564,7 @@ static int cx25821_start_video_dma_upstream(struct cx25821_dev *dev,
|
|
|
/* Set the physical start address of the RISC program in the initial
|
|
|
* program counter(IPC) member of the cmds.
|
|
|
*/
|
|
|
- cx_write(sram_ch->cmds_start + 0, dev->_dma_phys_addr);
|
|
|
+ cx_write(sram_ch->cmds_start + 0, out->_dma_phys_addr);
|
|
|
/* Risc IPC High 64 bits 63-32 */
|
|
|
cx_write(sram_ch->cmds_start + 4, 0);
|
|
|
|
|
|
@@ -731,7 +580,7 @@ static int cx25821_start_video_dma_upstream(struct cx25821_dev *dev,
|
|
|
cx_write(sram_ch->int_msk, tmp |= _intr_msk);
|
|
|
|
|
|
err = request_irq(dev->pci->irq, cx25821_upstream_irq,
|
|
|
- IRQF_SHARED, dev->name, dev);
|
|
|
+ IRQF_SHARED, dev->name, chan);
|
|
|
if (err < 0) {
|
|
|
pr_err("%s: can't get upstream IRQ %d\n",
|
|
|
dev->name, dev->pci->irq);
|
|
|
@@ -742,8 +591,8 @@ static int cx25821_start_video_dma_upstream(struct cx25821_dev *dev,
|
|
|
tmp = cx_read(sram_ch->dma_ctl);
|
|
|
cx_set(sram_ch->dma_ctl, tmp | FLD_VID_RISC_EN);
|
|
|
|
|
|
- dev->_is_running = 1;
|
|
|
- dev->_is_first_frame = 1;
|
|
|
+ out->_is_running = 1;
|
|
|
+ out->_is_first_frame = 1;
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
@@ -752,107 +601,71 @@ fail_irq:
|
|
|
return err;
|
|
|
}
|
|
|
|
|
|
-int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select,
|
|
|
+int cx25821_vidupstream_init(struct cx25821_channel *chan,
|
|
|
int pixel_format)
|
|
|
{
|
|
|
- struct sram_channel *sram_ch;
|
|
|
+ struct cx25821_video_out_data *out = chan->out;
|
|
|
+ struct cx25821_dev *dev = chan->dev;
|
|
|
+ const struct sram_channel *sram_ch;
|
|
|
u32 tmp;
|
|
|
int err = 0;
|
|
|
int data_frame_size = 0;
|
|
|
int risc_buffer_size = 0;
|
|
|
- int str_length = 0;
|
|
|
|
|
|
- if (dev->_is_running) {
|
|
|
+ if (out->_is_running) {
|
|
|
pr_info("Video Channel is still running so return!\n");
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
- dev->_channel_upstream_select = channel_select;
|
|
|
- sram_ch = dev->channels[channel_select].sram_channels;
|
|
|
+ sram_ch = chan->sram_channels;
|
|
|
|
|
|
- INIT_WORK(&dev->_irq_work_entry, cx25821_vidups_handler);
|
|
|
- dev->_irq_queues = create_singlethread_workqueue("cx25821_workqueue");
|
|
|
+ out->is_60hz = dev->tvnorm & V4L2_STD_525_60;
|
|
|
|
|
|
- if (!dev->_irq_queues) {
|
|
|
- pr_err("create_singlethread_workqueue() for Video FAILED!\n");
|
|
|
- return -ENOMEM;
|
|
|
- }
|
|
|
/* 656/VIP SRC Upstream Channel I & J and 7 - Host Bus Interface for
|
|
|
* channel A-C
|
|
|
*/
|
|
|
tmp = cx_read(VID_CH_MODE_SEL);
|
|
|
cx_write(VID_CH_MODE_SEL, tmp | 0x1B0001FF);
|
|
|
|
|
|
- dev->_is_running = 0;
|
|
|
- dev->_frame_count = 0;
|
|
|
- dev->_file_status = RESET_STATUS;
|
|
|
- dev->_lines_count = dev->_isNTSC ? 480 : 576;
|
|
|
- dev->_pixel_format = pixel_format;
|
|
|
- dev->_line_size = (dev->_pixel_format == PIXEL_FRMT_422) ?
|
|
|
+ out->_is_running = 0;
|
|
|
+ out->_frame_count = 0;
|
|
|
+ out->_file_status = RESET_STATUS;
|
|
|
+ out->_lines_count = out->is_60hz ? 480 : 576;
|
|
|
+ out->_pixel_format = pixel_format;
|
|
|
+ out->_line_size = (out->_pixel_format == PIXEL_FRMT_422) ?
|
|
|
(WIDTH_D1 * 2) : (WIDTH_D1 * 3) / 2;
|
|
|
- data_frame_size = dev->_isNTSC ? NTSC_DATA_BUF_SZ : PAL_DATA_BUF_SZ;
|
|
|
- risc_buffer_size = dev->_isNTSC ?
|
|
|
+ data_frame_size = out->is_60hz ? NTSC_DATA_BUF_SZ : PAL_DATA_BUF_SZ;
|
|
|
+ risc_buffer_size = out->is_60hz ?
|
|
|
NTSC_RISC_BUF_SIZE : PAL_RISC_BUF_SIZE;
|
|
|
|
|
|
- if (dev->input_filename) {
|
|
|
- str_length = strlen(dev->input_filename);
|
|
|
- dev->_filename = kmemdup(dev->input_filename, str_length + 1,
|
|
|
- GFP_KERNEL);
|
|
|
-
|
|
|
- if (!dev->_filename) {
|
|
|
- err = -ENOENT;
|
|
|
- goto error;
|
|
|
- }
|
|
|
- } else {
|
|
|
- str_length = strlen(dev->_defaultname);
|
|
|
- dev->_filename = kmemdup(dev->_defaultname, str_length + 1,
|
|
|
- GFP_KERNEL);
|
|
|
-
|
|
|
- if (!dev->_filename) {
|
|
|
- err = -ENOENT;
|
|
|
- goto error;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- /* Default if filename is empty string */
|
|
|
- if (strcmp(dev->_filename, "") == 0) {
|
|
|
- if (dev->_isNTSC) {
|
|
|
- dev->_filename =
|
|
|
- (dev->_pixel_format == PIXEL_FRMT_411) ?
|
|
|
- "/root/vid411.yuv" : "/root/vidtest.yuv";
|
|
|
- } else {
|
|
|
- dev->_filename =
|
|
|
- (dev->_pixel_format == PIXEL_FRMT_411) ?
|
|
|
- "/root/pal411.yuv" : "/root/pal422.yuv";
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- dev->_is_running = 0;
|
|
|
- dev->_frame_count = 0;
|
|
|
- dev->_file_status = RESET_STATUS;
|
|
|
- dev->_lines_count = dev->_isNTSC ? 480 : 576;
|
|
|
- dev->_pixel_format = pixel_format;
|
|
|
- dev->_line_size = (dev->_pixel_format == PIXEL_FRMT_422) ?
|
|
|
+ out->_is_running = 0;
|
|
|
+ out->_frame_count = 0;
|
|
|
+ out->_file_status = RESET_STATUS;
|
|
|
+ out->_lines_count = out->is_60hz ? 480 : 576;
|
|
|
+ out->_pixel_format = pixel_format;
|
|
|
+ out->_line_size = (out->_pixel_format == PIXEL_FRMT_422) ?
|
|
|
(WIDTH_D1 * 2) : (WIDTH_D1 * 3) / 2;
|
|
|
+ out->curpos = 0;
|
|
|
+ init_waitqueue_head(&out->waitq);
|
|
|
|
|
|
err = cx25821_sram_channel_setup_upstream(dev, sram_ch,
|
|
|
- dev->_line_size, 0);
|
|
|
+ out->_line_size, 0);
|
|
|
|
|
|
/* setup fifo + format */
|
|
|
- cx25821_set_pixelengine(dev, sram_ch, dev->_pixel_format);
|
|
|
+ cx25821_set_pixelengine(chan, sram_ch, out->_pixel_format);
|
|
|
|
|
|
- dev->upstream_riscbuf_size = risc_buffer_size * 2;
|
|
|
- dev->upstream_databuf_size = data_frame_size * 2;
|
|
|
+ out->upstream_riscbuf_size = risc_buffer_size * 2;
|
|
|
+ out->upstream_databuf_size = data_frame_size * 2;
|
|
|
|
|
|
/* Allocating buffers and prepare RISC program */
|
|
|
- err = cx25821_upstream_buffer_prepare(dev, sram_ch, dev->_line_size);
|
|
|
+ err = cx25821_upstream_buffer_prepare(chan, sram_ch, out->_line_size);
|
|
|
if (err < 0) {
|
|
|
pr_err("%s: Failed to set up Video upstream buffers!\n",
|
|
|
dev->name);
|
|
|
goto error;
|
|
|
}
|
|
|
|
|
|
- cx25821_start_video_dma_upstream(dev, sram_ch);
|
|
|
+ cx25821_start_video_dma_upstream(chan, sram_ch);
|
|
|
|
|
|
return 0;
|
|
|
|
Mauro Carvalho Chehab