aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx25821/cx25821-video-upstream.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/pci/cx25821/cx25821-video-upstream.c')
-rw-r--r--drivers/media/pci/cx25821/cx25821-video-upstream.c349
1 files changed, 175 insertions, 174 deletions
diff --git a/drivers/media/pci/cx25821/cx25821-video-upstream.c b/drivers/media/pci/cx25821/cx25821-video-upstream.c
index 223aae77c7eb..37cfc834e5c0 100644
--- a/drivers/media/pci/cx25821/cx25821-video-upstream.c
+++ b/drivers/media/pci/cx25821/cx25821-video-upstream.c
@@ -97,12 +97,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 +117,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 +129,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;
- const 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 +156,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 +174,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 +193,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 +205,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 +221,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,13 +247,14 @@ 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)
{
- const 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;
}
@@ -264,49 +267,53 @@ void cx25821_stop_upstream_video_ch1(struct cx25821_dev *dev)
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);
+ if (out->_data_buf_virt_addr)
+ memset(out->_data_buf_virt_addr, 0, out->_data_buf_size);
- dev->_is_running = 0;
- dev->_is_first_frame = 0;
- dev->_frame_count = 0;
- dev->_file_status = END_OF_FILE;
+ out->_is_running = 0;
+ out->_is_first_frame = 0;
+ out->_frame_count = 0;
+ out->_file_status = END_OF_FILE;
- kfree(dev->_irq_queues);
- dev->_irq_queues = NULL;
+ destroy_workqueue(out->_irq_queues);
+ out->_irq_queues = NULL;
- kfree(dev->_filename);
+ kfree(out->_filename);
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,
+static int cx25821_get_frame(struct cx25821_channel *chan,
const struct sram_channel *sram_ch)
{
+ struct cx25821_video_out_data *out = chan->out;
struct file *myfile;
- int frame_index_temp = dev->_frame_index;
+ int frame_index_temp = out->_frame_index;
int i = 0;
- int line_size = (dev->_pixel_format == PIXEL_FRMT_411) ?
+ int line_size = (out->_pixel_format == PIXEL_FRMT_411) ?
Y411_LINE_SZ : Y422_LINE_SZ;
int frame_size = 0;
int frame_offset = 0;
@@ -316,10 +323,10 @@ static int cx25821_get_frame(struct cx25821_dev *dev,
loff_t pos;
mm_segment_t old_fs;
- if (dev->_file_status == END_OF_FILE)
+ if (out->_file_status == END_OF_FILE)
return 0;
- if (dev->_isNTSC)
+ if (out->is_60hz)
frame_size = (line_size == Y411_LINE_SZ) ?
FRAME_SIZE_NTSC_Y411 : FRAME_SIZE_NTSC_Y422;
else
@@ -327,14 +334,14 @@ static int cx25821_get_frame(struct cx25821_dev *dev,
FRAME_SIZE_PAL_Y411 : FRAME_SIZE_PAL_Y422;
frame_offset = (frame_index_temp > 0) ? frame_size : 0;
- file_offset = dev->_frame_count * frame_size;
+ file_offset = out->_frame_count * frame_size;
- myfile = filp_open(dev->_filename, O_RDONLY | O_LARGEFILE, 0);
+ myfile = filp_open(out->_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);
+ __func__, out->_filename, open_errno);
return PTR_ERR(myfile);
} else {
if (!(myfile->f_op)) {
@@ -355,15 +362,15 @@ static int cx25821_get_frame(struct cx25821_dev *dev,
old_fs = get_fs();
set_fs(KERNEL_DS);
- for (i = 0; i < dev->_lines_count; i++) {
+ for (i = 0; i < out->_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 +
+ && out->_data_buf_virt_addr != NULL) {
+ memcpy((void *)(out->_data_buf_virt_addr +
frame_offset / 4), mybuf,
vfs_read_retval);
}
@@ -379,9 +386,9 @@ static int cx25821_get_frame(struct cx25821_dev *dev,
}
if (i > 0)
- dev->_frame_count++;
+ out->_frame_count++;
- dev->_file_status = (vfs_read_retval == line_size) ?
+ out->_file_status = (vfs_read_retval == line_size) ?
IN_PROGRESS : END_OF_FILE;
set_fs(old_fs);
@@ -393,25 +400,19 @@ static int cx25821_get_frame(struct cx25821_dev *dev,
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;
- }
+ struct cx25821_video_out_data *out =
+ container_of(work, struct cx25821_video_out_data, _irq_work_entry);
- cx25821_get_frame(dev, dev->channels[dev->_channel_upstream_select].
- sram_channels);
+ cx25821_get_frame(out->chan, out->chan->sram_channels);
}
-static int cx25821_openfile(struct cx25821_dev *dev,
+static int cx25821_openfile(struct cx25821_channel *chan,
const struct sram_channel *sram_ch)
{
+ struct cx25821_video_out_data *out = chan->out;
struct file *myfile;
int i = 0, j = 0;
- int line_size = (dev->_pixel_format == PIXEL_FRMT_411) ?
+ int line_size = (out->_pixel_format == PIXEL_FRMT_411) ?
Y411_LINE_SZ : Y422_LINE_SZ;
ssize_t vfs_read_retval = 0;
char mybuf[line_size];
@@ -419,12 +420,12 @@ static int cx25821_openfile(struct cx25821_dev *dev,
loff_t offset = (unsigned long)0;
mm_segment_t old_fs;
- myfile = filp_open(dev->_filename, O_RDONLY | O_LARGEFILE, 0);
+ myfile = filp_open(out->_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);
+ __func__, out->_filename, open_errno);
return PTR_ERR(myfile);
} else {
if (!(myfile->f_op)) {
@@ -446,7 +447,7 @@ static int cx25821_openfile(struct cx25821_dev *dev,
set_fs(KERNEL_DS);
for (j = 0; j < NUM_FRAMES; j++) {
- for (i = 0; i < dev->_lines_count; i++) {
+ for (i = 0; i < out->_lines_count; i++) {
pos = offset;
vfs_read_retval = vfs_read(myfile, mybuf,
@@ -454,8 +455,8 @@ static int cx25821_openfile(struct cx25821_dev *dev,
if (vfs_read_retval > 0
&& vfs_read_retval == line_size
- && dev->_data_buf_virt_addr != NULL) {
- memcpy((void *)(dev->
+ && out->_data_buf_virt_addr != NULL) {
+ memcpy((void *)(out->
_data_buf_virt_addr +
offset / 4), mybuf,
vfs_read_retval);
@@ -471,13 +472,13 @@ static int cx25821_openfile(struct cx25821_dev *dev,
}
if (i > 0)
- dev->_frame_count++;
+ out->_frame_count++;
if (vfs_read_retval < line_size)
break;
}
- dev->_file_status = (vfs_read_retval == line_size) ?
+ out->_file_status = (vfs_read_retval == line_size) ?
IN_PROGRESS : END_OF_FILE;
set_fs(old_fs);
@@ -488,58 +489,60 @@ static int cx25821_openfile(struct cx25821_dev *dev,
return 0;
}
-static int cx25821_upstream_buffer_prepare(struct cx25821_dev *dev,
+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);
+ memset(out->_data_buf_virt_addr, 0, out->_data_buf_size);
- ret = cx25821_openfile(dev, sram_ch);
+ ret = cx25821_openfile(chan, sram_ch);
if (ret < 0)
return ret;
/* 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 +554,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;
- const 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;
@@ -574,14 +578,14 @@ static int cx25821_video_upstream_irq(struct cx25821_dev *dev, int chan_num,
spin_lock(&dev->slock);
- dev->_frame_index = prog_cnt;
+ out->_frame_index = prog_cnt;
- queue_work(dev->_irq_queues, &dev->_irq_work_entry);
+ queue_work(out->_irq_queues, &out->_irq_work_entry);
- 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 +593,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 +630,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 +643,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;
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,
+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 +687,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 +698,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,
+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 +715,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 +731,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 +742,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,9 +752,11 @@ 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 cx25821_video_out_data *out = chan->out;
+ struct cx25821_dev *dev = chan->dev;
const struct sram_channel *sram_ch;
u32 tmp;
int err = 0;
@@ -762,18 +764,17 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select,
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");
+ INIT_WORK(&out->_irq_work_entry, cx25821_vidups_handler);
+ out->_irq_queues = create_singlethread_workqueue("cx25821_workqueue");
- if (!dev->_irq_queues) {
+ if (!out->_irq_queues) {
pr_err("create_singlethread_workqueue() for Video FAILED!\n");
return -ENOMEM;
}
@@ -783,76 +784,76 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select,
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,
+ if (out->input_filename) {
+ str_length = strlen(out->input_filename);
+ out->_filename = kmemdup(out->input_filename, str_length + 1,
GFP_KERNEL);
- if (!dev->_filename) {
+ if (!out->_filename) {
err = -ENOENT;
goto error;
}
} else {
- str_length = strlen(dev->_defaultname);
- dev->_filename = kmemdup(dev->_defaultname, str_length + 1,
+ str_length = strlen(out->_defaultname);
+ out->_filename = kmemdup(out->_defaultname, str_length + 1,
GFP_KERNEL);
- if (!dev->_filename) {
+ if (!out->_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) ?
+ if (strcmp(out->_filename, "") == 0) {
+ if (out->is_60hz) {
+ out->_filename =
+ (out->_pixel_format == PIXEL_FRMT_411) ?
"/root/vid411.yuv" : "/root/vidtest.yuv";
} else {
- dev->_filename =
- (dev->_pixel_format == PIXEL_FRMT_411) ?
+ out->_filename =
+ (out->_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;
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;

Privacy Policy