From: Hans Verkuil
This fixes several issues found with 'v4l2-compliance -s':
1) read()/write() is supported, but not reported in the capabilities
2) S_STD(G_STD()) failed: setting the same standard should just return 0.
3) G_PARM failed to set readbuffers.
4) different field values in the forma
The zoran driver is split in many modules, but this lead to some
problems.
One of them is that load order is incorrect when everything is built-in.
Having more than one module is useless, so merge all zoran modules in
one.
Signed-off-by: Corentin Labbe
---
drivers/staging/media/zoran/Kconfig
All zoran module will be merged, so to prevent conflict, the debug
module parameter need to be renamed
Signed-off-by: Corentin Labbe
---
drivers/staging/media/zoran/videocodec.c | 8
drivers/staging/media/zoran/zr36016.c| 12 ++--
drivers/staging/media/zoran/zr36050.c|
After each capture, zoran driver complains that it remains some unused
buffer. This is due to a missing count handling.
Signed-off-by: Corentin Labbe
---
drivers/staging/media/zoran/zoran_driver.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/staging/media/zoran/zoran_driver.c
b/d
From: Hans Verkuil
TRY_FMT must not set actual capture values (zr->buffer_size in
this case), since it is a 'try' only.
zoran_try_fmt_vid_cap() also didn't fill in fmt->fmt.pix.bytesperline
and fmt->fmt.pix.sizeimage correctly.
Signed-off-by: Hans Verkuil
Signed-off-by: Corentin Labbe
---
dr
Add debugfs for displaying zoran debug and stats information.
Signed-off-by: Corentin Labbe
---
drivers/staging/media/zoran/Kconfig | 1 +
drivers/staging/media/zoran/zoran.h | 2 ++
drivers/staging/media/zoran/zoran_card.c | 36
3 files changed, 39 insertion
Reduces the size of the probe function by adding zoran_i2c_init/zoran_i2c_exit
functions.
Signed-off-by: Corentin Labbe
---
drivers/staging/media/zoran/zoran_card.c | 73 ++--
1 file changed, 54 insertions(+), 19 deletions(-)
diff --git a/drivers/staging/media/zoran/zoran_ca
We need to empty zoran_init() for removing it later.
Furthermore, this permit to use pci_xxx instead of pr_xxx for prettier
printing.
Signed-off-by: Corentin Labbe
---
drivers/staging/media/zoran/zoran_card.c | 64
1 file changed, 33 insertions(+), 31 deletions(-)
diff
Since all kconfigs for card selection are bool, this causes all selected modules
to be always built-in.
Prevent this by moving selects to the main tristate kconfig.
By doing this, remove also all "if MEDIA_SUBDRV_AUTOSELECT" which are
wrong, since zoran always need them to work.
Signed-off-by: Co
Move some code out of zr36057_init() and create new functions for handling
zr->video_dev.
This permit to ease code reading and fix a zr->video_dev memory leak.
Signed-off-by: Corentin Labbe
---
drivers/staging/media/zoran/zoran.h| 2 +-
drivers/staging/media/zoran/zoran_card.c | 80 +
From: Hans Verkuil
This makes no sense for MJPEG formats and it is just easier to
drop support for this altogether.
Signed-off-by: Hans Verkuil
Signed-off-by: Corentin Labbe
---
drivers/staging/media/zoran/zoran_card.c | 2 +-
drivers/staging/media/zoran/zoran_driver.c | 12
2
vb2_dma_contig_set_max_seg_size need to have a size in parameter and not
a DMA_BIT_MASK().
While fixing this issue, also fix error handling of all DMA size
setting.
Reported-by: kernel test robot
Fixes: d4ae3689226e5 ("media: zoran: device support only 32bit DMA address")
Signed-off-by: Corentin
The vidmem parameter is no longer necessary since we removed framebuffer
support.
Signed-off-by: Corentin Labbe
---
drivers/staging/media/zoran/zoran_card.c | 15 ---
1 file changed, 15 deletions(-)
diff --git a/drivers/staging/media/zoran/zoran_card.c
b/drivers/staging/media/zoran
It remains some unused code from old zoran buffer handling.
Let's remove them.
Signed-off-by: Corentin Labbe
---
drivers/staging/media/zoran/zoran.h| 14 -
drivers/staging/media/zoran/zoran_card.c | 36 --
drivers/staging/media/zoran/zoran_device.h | 2 --
From: Hans Verkuil
Do not spam the kernel log with messages that result from incorrect
userspace input. Those should be either dropped completely (the error
code gives sufficient info) or changed to debug messages.
Signed-off-by: Hans Verkuil
Signed-off-by: Corentin Labbe
---
drivers/staging/
On the case tmp_dcim=1, the index of buffer is miscalculated.
This generate a NULL pointer dereference later.
So let's fix the calcul and add a check to prevent this to reappear.
Signed-off-by: Corentin Labbe
---
drivers/staging/media/zoran/zoran_device.c | 7 ++-
1 file changed, 6 insertio
Simplify code by using module_pci_driver()
Signed-off-by: Corentin Labbe
---
drivers/staging/media/zoran/zoran_card.c | 21 +
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/drivers/staging/media/zoran/zoran_card.c
b/drivers/staging/media/zoran/zoran_card.c
ind
Now we have a debugfs, we can remove all PROCFS stuff.
We keep videocodec_debugfs_show(), it will be used later
Signed-off-by: Corentin Labbe
---
drivers/staging/media/zoran/videocodec.c | 24 +---
drivers/staging/media/zoran/videocodec.h | 3 +++
2 files changed, 4 insertio
Hello
The main change of this serie is to merge all zoran related modules in
one.
This fixes the load order problem when everything is built-in.
But this serie include several more fixes found while working on this.
Regards
Changes since v3:
- Fixed a lock up when doing a capture
- added fixes p
19 matches
Mail list logo
