mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
ieee1394: video1394: DMA fix
This together with the phys_to_virt fix in lib/swiotlb.c::swiotlb_sync_sg fixes video1394 DMA on machines with DMA bounce buffers, especially Intel x86-64 machines with > 3GB RAM. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: David Moore <dcm@acm.org> Tested-by: Nicolas Turro <Nicolas.Turro@inrialpes.fr>
This commit is contained in:
parent
0fe4c6fcac
commit
a5782010b4
1 changed files with 8 additions and 0 deletions
|
@ -489,6 +489,9 @@ static void wakeup_dma_ir_ctx(unsigned long l)
|
|||
reset_ir_status(d, i);
|
||||
d->buffer_status[d->buffer_prg_assignment[i]] = VIDEO1394_BUFFER_READY;
|
||||
do_gettimeofday(&d->buffer_time[d->buffer_prg_assignment[i]]);
|
||||
dma_region_sync_for_cpu(&d->dma,
|
||||
d->buffer_prg_assignment[i] * d->buf_size,
|
||||
d->buf_size);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1096,6 +1099,8 @@ static long video1394_ioctl(struct file *file,
|
|||
DBGMSG(ohci->host->id, "Starting iso transmit DMA ctx=%d",
|
||||
d->ctx);
|
||||
put_timestamp(ohci, d, d->last_buffer);
|
||||
dma_region_sync_for_device(&d->dma,
|
||||
v.buffer * d->buf_size, d->buf_size);
|
||||
|
||||
/* Tell the controller where the first program is */
|
||||
reg_write(ohci, d->cmdPtr,
|
||||
|
@ -1111,6 +1116,9 @@ static long video1394_ioctl(struct file *file,
|
|||
"Waking up iso transmit dma ctx=%d",
|
||||
d->ctx);
|
||||
put_timestamp(ohci, d, d->last_buffer);
|
||||
dma_region_sync_for_device(&d->dma,
|
||||
v.buffer * d->buf_size, d->buf_size);
|
||||
|
||||
reg_write(ohci, d->ctrlSet, 0x1000);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue