Skip to content

L
linux
Commit 4cb41595 authored by Stelian Pop's avatar Stelian Pop Committed by Linus Torvalds
Browse files
Options

[PATCH] meye driver update 

This patch (+ BK changeset) converts the meye driver to the new DMA API,
this is necessary for the driver to be used in 2.5. 

Stelian.

ChangeSet@1.332, 2002-02-15 16:35:31+01:00, stelian@popies.net
  Convert to the new DMA API and allocate separate DMA pages instead of one big buffer.
parent 3ec6551a
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 85 deletions
drivers/media/video/meye.c
View file @ 4cb41595
...@@ -142,25 +142,6 @@ static inline unsigned long uvirt_to_kva(pgd_t *pgd, unsigned long adr) { ...@@ -142,25 +142,6 @@ static inline unsigned long uvirt_to_kva(pgd_t *pgd, unsigned long adr) {
return ret; return ret;
} }
static inline unsigned long uvirt_to_bus(unsigned long adr) {
unsigned long kva, ret;
kva = uvirt_to_kva(pgd_offset(current->mm, adr), adr);
ret = virt_to_bus((void *)kva);
MDEBUG(printk("uv2b(%lx-->%lx)\n", adr, ret));
return ret;
}
static inline unsigned long kvirt_to_bus(unsigned long adr) {
unsigned long va, kva, ret;
va = VMALLOC_VMADDR(adr);
kva = uvirt_to_kva(pgd_offset_k(va), va);
ret = virt_to_bus((void *)kva);
MDEBUG(printk("kv2b(%lx-->%lx)\n", adr, ret));
return ret;
}
/* Here we want the physical address of the memory. /* Here we want the physical address of the memory.
* This is used when initializing the contents of the * This is used when initializing the contents of the
* area and marking the pages as reserved. * area and marking the pages as reserved.
...@@ -209,31 +190,64 @@ static void rvfree(void * mem, signed long size) { ...@@ -209,31 +190,64 @@ static void rvfree(void * mem, signed long size) {
} }
/* return a page table pointing to N pages of locked memory */ /* return a page table pointing to N pages of locked memory */
static void *ptable_alloc(int npages, u32 *pt_addr) { static int ptable_alloc(void) {
u32 *pt;
int i; int i;
void *vmem;
u32 *ptable; memset(meye.mchip_ptable, 0, sizeof(meye.mchip_ptable));
unsigned long adr;
meye.mchip_ptable[MCHIP_NB_PAGES] = pci_alloc_consistent(meye.mchip_dev,
vmem = rvmalloc((npages + 1) * PAGE_SIZE); PAGE_SIZE,
if (!vmem) &meye.mchip_dmahandle);
return NULL; if (!meye.mchip_ptable[MCHIP_NB_PAGES])
return -1;
adr = (unsigned long)vmem;
ptable = (u32 *)(vmem + npages * PAGE_SIZE); pt = (u32 *)meye.mchip_ptable[MCHIP_NB_PAGES];
for (i = 0; i < npages; i++) { for (i = 0; i < MCHIP_NB_PAGES; i++) {
ptable[i] = (u32) kvirt_to_bus(adr); meye.mchip_ptable[i] = pci_alloc_consistent(meye.mchip_dev,
adr += PAGE_SIZE; PAGE_SIZE,
pt);
if (!meye.mchip_ptable[i])
return -1;
pt++;
} }
return 0;
}
*pt_addr = (u32) kvirt_to_bus(adr); static void ptable_free(void) {
return vmem; u32 *pt;
int i;
pt = (u32 *)meye.mchip_ptable[MCHIP_NB_PAGES];
for (i = 0; i < MCHIP_NB_PAGES; i++)
if (meye.mchip_ptable[i])
pci_free_consistent(meye.mchip_dev,
PAGE_SIZE,
meye.mchip_ptable[i], *pt);
if (meye.mchip_ptable[MCHIP_NB_PAGES])
pci_free_consistent(meye.mchip_dev,
PAGE_SIZE,
meye.mchip_ptable[MCHIP_NB_PAGES],
meye.mchip_dmahandle);
memset(meye.mchip_ptable, 0, sizeof(meye.mchip_ptable));
meye.mchip_dmahandle = 0;
} }
static void ptable_free(void *vmem, int npages) { /* copy data from ptable into buf */
rvfree(vmem, (npages + 1) * PAGE_SIZE); static void ptable_copy(u8 *buf, int start, int size, int pt_pages) {
int i;
for (i = 0; i < (size / PAGE_SIZE) * PAGE_SIZE; i += PAGE_SIZE) {
memcpy(buf + i, meye.mchip_ptable[start++], PAGE_SIZE);
if (start >= pt_pages)
start = 0;
}
memcpy(buf + i, meye.mchip_ptable[start], size % PAGE_SIZE);
} }
/****************************************************************************/ /****************************************************************************/
/* JPEG tables at different qualities to load into the VRJ chip */ /* JPEG tables at different qualities to load into the VRJ chip */
/****************************************************************************/ /****************************************************************************/
...@@ -587,29 +601,23 @@ static void mchip_vrj_setup(u8 mode) { ...@@ -587,29 +601,23 @@ static void mchip_vrj_setup(u8 mode) {
/* setup for DMA transfers - also zeros the framebuffer */ /* setup for DMA transfers - also zeros the framebuffer */
static int mchip_dma_alloc(void) { static int mchip_dma_alloc(void) {
if (!meye.mchip_fbuffer) { if (!meye.mchip_dmahandle)
meye.mchip_fbuffer = ptable_alloc(MCHIP_NB_PAGES, if (ptable_alloc())
&meye.mchip_ptaddr);
if (!meye.mchip_fbuffer)
return -1; return -1;
}
return 0; return 0;
} }
/* frees the DMA buffer */ /* frees the DMA buffer */
static void mchip_dma_free(void) { static void mchip_dma_free(void) {
if (meye.mchip_fbuffer) { if (meye.mchip_dmahandle)
ptable_free(meye.mchip_fbuffer, MCHIP_NB_PAGES); ptable_free();
meye.mchip_fbuffer = 0;
meye.mchip_ptaddr = 0;
}
} }
/* sets the DMA parameters into the chip */ /* sets the DMA parameters into the chip */
static void mchip_dma_setup(void) { static void mchip_dma_setup(void) {
int i; int i;
mchip_set(MCHIP_MM_PT_ADDR, meye.mchip_ptaddr); mchip_set(MCHIP_MM_PT_ADDR, meye.mchip_dmahandle);
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
mchip_set(MCHIP_MM_FIR(i), 0); mchip_set(MCHIP_MM_FIR(i), 0);
meye.mchip_fnum = 0; meye.mchip_fnum = 0;
...@@ -658,60 +666,41 @@ static void mchip_free_frame(void) { ...@@ -658,60 +666,41 @@ static void mchip_free_frame(void) {
meye.mchip_fnum %= 4; meye.mchip_fnum %= 4;
} }
/* read one frame from the framebuffer assuming it was captured using /* read one frame from the framebuffer assuming it was captured using
a uncompressed transfer */ a uncompressed transfer */
static void mchip_cont_read_frame(u32 v, u8 *buf, int size) { static void mchip_cont_read_frame(u32 v, u8 *buf, int size) {
int pt_id; int pt_id;
int avail;
pt_id = (v >> 17) & 0x3FF; pt_id = (v >> 17) & 0x3FF;
avail = MCHIP_NB_PAGES - pt_id;
if (size > avail*PAGE_SIZE) { ptable_copy(buf, pt_id, size, MCHIP_NB_PAGES);
memcpy(buf, meye.mchip_fbuffer + pt_id * PAGE_SIZE,
avail * PAGE_SIZE);
memcpy(buf +avail * PAGE_SIZE, meye.mchip_fbuffer,
size - avail * PAGE_SIZE);
}
else
memcpy(buf, meye.mchip_fbuffer + pt_id * PAGE_SIZE, size);
} }
/* read a compressed frame from the framebuffer */ /* read a compressed frame from the framebuffer */
static int mchip_comp_read_frame(u32 v, u8 *buf, int size) { static int mchip_comp_read_frame(u32 v, u8 *buf, int size) {
int pt_start, pt_end, trailer; int pt_start, pt_end, trailer;
int fsize, fsize2; int fsize;
int i; int i;
pt_start = (v >> 19) & 0xFF; pt_start = (v >> 19) & 0xFF;
pt_end = (v >> 11) & 0xFF; pt_end = (v >> 11) & 0xFF;
trailer = (v >> 1) & 0x3FF; trailer = (v >> 1) & 0x3FF;
if (pt_end < pt_start) { if (pt_end < pt_start)
fsize = (MCHIP_NB_PAGES_MJPEG - pt_start) * PAGE_SIZE; fsize = (MCHIP_NB_PAGES_MJPEG - pt_start) * PAGE_SIZE +
fsize2 = pt_end * PAGE_SIZE + trailer * 4; pt_end * PAGE_SIZE + trailer * 4;
if (fsize + fsize2 > size) { else
printk(KERN_WARNING "meye: oversized compressed frame %d %d\n",
fsize, fsize2);
return -1;
} else {
memcpy(buf, meye.mchip_fbuffer + pt_start * PAGE_SIZE,
fsize);
memcpy(buf + fsize, meye.mchip_fbuffer, fsize2);
fsize += fsize2;
}
} else {
fsize = (pt_end - pt_start) * PAGE_SIZE + trailer * 4; fsize = (pt_end - pt_start) * PAGE_SIZE + trailer * 4;
if (fsize > size) {
printk(KERN_WARNING "meye: oversized compressed frame %d\n", if (fsize > size) {
fsize); printk(KERN_WARNING "meye: oversized compressed frame %d\n",
return -1; fsize);
} else return -1;
memcpy(buf, meye.mchip_fbuffer + pt_start * PAGE_SIZE,
fsize);
} }
ptable_copy(buf, pt_start, fsize, MCHIP_NB_PAGES_MJPEG);
#ifdef MEYE_JPEG_CORRECTION #ifdef MEYE_JPEG_CORRECTION
......
drivers/media/video/meye.h
View file @ 4cb41595
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#define _MEYE_PRIV_H_ #define _MEYE_PRIV_H_
#define MEYE_DRIVER_MAJORVERSION 1 #define MEYE_DRIVER_MAJORVERSION 1
#define MEYE_DRIVER_MINORVERSION 1 #define MEYE_DRIVER_MINORVERSION 2
/****************************************************************************/ /****************************************************************************/
/* Motion JPEG chip registers */ /* Motion JPEG chip registers */
...@@ -292,8 +292,8 @@ struct meye { ...@@ -292,8 +292,8 @@ struct meye {
u8 mchip_fnum; /* current mchip frame number */ u8 mchip_fnum; /* current mchip frame number */
unsigned char *mchip_mmregs; /* mchip: memory mapped registers */ unsigned char *mchip_mmregs; /* mchip: memory mapped registers */
unsigned char *mchip_fbuffer; /* mchip: framebuffer */ u8 *mchip_ptable[MCHIP_NB_PAGES+1];/* mchip: ptable + ptable toc */
u32 mchip_ptaddr; /* mchip: pointer to framebuffer */ dma_addr_t mchip_dmahandle; /* mchip: dma handle to ptable toc */
unsigned char *grab_fbuffer; /* capture framebuffer */ unsigned char *grab_fbuffer; /* capture framebuffer */
/* list of buffers */ /* list of buffers */
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7