Commit 0a68fc44 authored by Daniel Scheller's avatar Daniel Scheller Committed by Mauro Carvalho Chehab

media: ddbridge: make DMA buffer count and size modparam-configurable

Make the number of DMA buffers and their size configurable using module
parameters. Being able to set these to a higher number might help on
busy systems when handling overall high data rates without having to
edit the driver sources and recompile things.

Picked up from the upstream dddvb-0.9.33 release.
Signed-off-by: default avatarDaniel Scheller <d.scheller@gmx.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 60586360
...@@ -96,6 +96,15 @@ static int stv0910_single; ...@@ -96,6 +96,15 @@ static int stv0910_single;
module_param(stv0910_single, int, 0444); module_param(stv0910_single, int, 0444);
MODULE_PARM_DESC(stv0910_single, "use stv0910 cards as single demods"); MODULE_PARM_DESC(stv0910_single, "use stv0910 cards as single demods");
static int dma_buf_num = 8;
module_param(dma_buf_num, int, 0444);
MODULE_PARM_DESC(dma_buf_num, "Number of DMA buffers, possible values: 8-32");
static int dma_buf_size = 21;
module_param(dma_buf_size, int, 0444);
MODULE_PARM_DESC(dma_buf_size,
"DMA buffer size as multiple of 128*47, possible values: 1-43");
/****************************************************************************/ /****************************************************************************/
static DEFINE_MUTEX(redirect_lock); static DEFINE_MUTEX(redirect_lock);
...@@ -2172,16 +2181,16 @@ static void ddb_dma_init(struct ddb_io *io, int nr, int out) ...@@ -2172,16 +2181,16 @@ static void ddb_dma_init(struct ddb_io *io, int nr, int out)
INIT_WORK(&dma->work, output_work); INIT_WORK(&dma->work, output_work);
dma->regs = rm->odma->base + rm->odma->size * nr; dma->regs = rm->odma->base + rm->odma->size * nr;
dma->bufregs = rm->odma_buf->base + rm->odma_buf->size * nr; dma->bufregs = rm->odma_buf->base + rm->odma_buf->size * nr;
dma->num = OUTPUT_DMA_BUFS; dma->num = dma_buf_num;
dma->size = OUTPUT_DMA_SIZE; dma->size = dma_buf_size * 128 * 47;
dma->div = OUTPUT_DMA_IRQ_DIV; dma->div = 1;
} else { } else {
INIT_WORK(&dma->work, input_work); INIT_WORK(&dma->work, input_work);
dma->regs = rm->idma->base + rm->idma->size * nr; dma->regs = rm->idma->base + rm->idma->size * nr;
dma->bufregs = rm->idma_buf->base + rm->idma_buf->size * nr; dma->bufregs = rm->idma_buf->base + rm->idma_buf->size * nr;
dma->num = INPUT_DMA_BUFS; dma->num = dma_buf_num;
dma->size = INPUT_DMA_SIZE; dma->size = dma_buf_size * 128 * 47;
dma->div = INPUT_DMA_IRQ_DIV; dma->div = 1;
} }
ddbwritel(io->port->dev, 0, DMA_BUFFER_ACK(dma)); ddbwritel(io->port->dev, 0, DMA_BUFFER_ACK(dma));
dev_dbg(io->port->dev->dev, "init link %u, io %u, dma %u, dmaregs %08x bufregs %08x\n", dev_dbg(io->port->dev->dev, "init link %u, io %u, dma %u, dmaregs %08x bufregs %08x\n",
...@@ -3338,6 +3347,15 @@ int ddb_exit_ddbridge(int stage, int error) ...@@ -3338,6 +3347,15 @@ int ddb_exit_ddbridge(int stage, int error)
int ddb_init_ddbridge(void) int ddb_init_ddbridge(void)
{ {
if (dma_buf_num < 8)
dma_buf_num = 8;
if (dma_buf_num > 32)
dma_buf_num = 32;
if (dma_buf_size < 1)
dma_buf_size = 1;
if (dma_buf_size > 43)
dma_buf_size = 43;
if (ddb_class_create() < 0) if (ddb_class_create() < 0)
return -1; return -1;
ddb_wq = alloc_workqueue("ddbridge", 0, 0); ddb_wq = alloc_workqueue("ddbridge", 0, 0);
......
...@@ -136,20 +136,8 @@ struct ddb_info { ...@@ -136,20 +136,8 @@ struct ddb_info {
const struct ddb_regmap *regmap; const struct ddb_regmap *regmap;
}; };
/* DMA_SIZE MUST be smaller than 256k and
* MUST be divisible by 188 and 128 !!!
*/
#define DMA_MAX_BUFS 32 /* hardware table limit */ #define DMA_MAX_BUFS 32 /* hardware table limit */
#define INPUT_DMA_BUFS 8
#define INPUT_DMA_SIZE (128 * 47 * 21)
#define INPUT_DMA_IRQ_DIV 1
#define OUTPUT_DMA_BUFS 8
#define OUTPUT_DMA_SIZE (128 * 47 * 21)
#define OUTPUT_DMA_IRQ_DIV 1
struct ddb; struct ddb;
struct ddb_port; struct ddb_port;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment