diff -r e9e1b86b7892 linux/drivers/media/dvb/ttpci/budget-core.c --- a/linux/drivers/media/dvb/ttpci/budget-core.c Mon Apr 23 07:41:13 2007 +0200 +++ b/linux/drivers/media/dvb/ttpci/budget-core.c Mon Apr 30 01:29:42 2007 +0200 @@ -74,6 +74,7 @@ static int start_ts_capture(struct budge static int start_ts_capture(struct budget *budget) { struct saa7146_dev *dev = budget->dev; + u32 dma_base = (u32) budget->dma; dprintk(2, "budget: %p\n", budget); @@ -137,16 +138,16 @@ static int start_ts_capture(struct budge saa7146_write(dev, MC2, (MASK_08 | MASK_24)); mdelay(10); - saa7146_write(dev, BASE_ODD3, 0); + saa7146_write(dev, BASE_ODD3, dma_base); if (budget->buffer_size > budget->buffer_height * budget->buffer_width) { // using odd/even buffers - saa7146_write(dev, BASE_EVEN3, budget->buffer_height * budget->buffer_width); + saa7146_write(dev, BASE_EVEN3, dma_base + budget->buffer_height * budget->buffer_width); } else { // using a single buffer - saa7146_write(dev, BASE_EVEN3, 0); - } - saa7146_write(dev, PROT_ADDR3, budget->buffer_size); - saa7146_write(dev, BASE_PAGE3, budget->pt.dma | ME1 | 0x90); + saa7146_write(dev, BASE_EVEN3, dma_base); + } + saa7146_write(dev, PROT_ADDR3, dma_base + budget->buffer_size); + saa7146_write(dev, BASE_PAGE3, 0x90); saa7146_write(dev, PITCH3, budget->buffer_width); saa7146_write(dev, NUM_LINE_BYTE3, @@ -190,9 +191,9 @@ static void vpeirq(unsigned long data) static void vpeirq(unsigned long data) { struct budget *budget = (struct budget *) data; - u8 *mem = (u8 *) (budget->grabbing); + u8 *mem = budget->grabbing; u32 olddma = budget->ttbp; - u32 newdma = saa7146_read(budget->dev, PCI_VDP3); + u32 newdma = saa7146_read(budget->dev, PCI_VDP3) - (u32) budget->dma; u32 count; /* nearest lower position divisible by 188 */ @@ -510,8 +511,9 @@ int ttpci_budget_init(struct budget *bud ttpci_eeprom_parse_mac(&budget->i2c_adap, budget->dvb_adapter.proposed_mac); - if (NULL == - (budget->grabbing = saa7146_vmalloc_build_pgtable(dev->pci, budget->buffer_size, &budget->pt))) { + budget->grabbing = pci_alloc_consistent(dev->pci, budget->buffer_size, + &budget->dma); + if (NULL == budget->grabbing) { ret = -ENOMEM; goto err; } @@ -526,13 +528,15 @@ int ttpci_budget_init(struct budget *bud if (bi->type != BUDGET_FS_ACTIVY) saa7146_setgpio(dev, 2, SAA7146_GPIO_OUTHI); - if (budget_register(budget) == 0) { + if (budget_register(budget) == 0) return 0; - } + err: i2c_del_adapter(&budget->i2c_adap); - vfree(budget->grabbing); + if (budget->grabbing) + pci_free_consistent(dev->pci, budget->buffer_size, + budget->grabbing, budget->dma); dvb_unregister_adapter(&budget->dvb_adapter); @@ -561,9 +565,8 @@ int ttpci_budget_deinit(struct budget *b tasklet_kill(&budget->vpe_tasklet); - saa7146_pgtable_free(dev->pci, &budget->pt); - - vfree(budget->grabbing); + pci_free_consistent(dev->pci, budget->buffer_size, + budget->grabbing, budget->dma); return 0; } diff -r e9e1b86b7892 linux/drivers/media/dvb/ttpci/budget.h --- a/linux/drivers/media/dvb/ttpci/budget.h Mon Apr 23 07:41:13 2007 +0200 +++ b/linux/drivers/media/dvb/ttpci/budget.h Mon Apr 30 01:32:53 2007 +0200 @@ -48,9 +48,6 @@ struct budget { struct i2c_adapter i2c_adap; struct budget_info *card; - unsigned char *grabbing; - struct saa7146_pgtable pt; - struct tasklet_struct fidb_tasklet; struct tasklet_struct vpe_tasklet; @@ -63,6 +60,8 @@ struct budget { int ci_present; int video_port; + void *grabbing; + dma_addr_t dma; u32 buffer_width; u32 buffer_height; u32 buffer_size;