[Mjpeg-users] bringing back media/zoran driver

hello I am the owner of a zoran based DC10+ card. I am in the need of using it since yesterday and I found that its driver was removed. Reverting the removing patch made to a temporary working situation. If I understand correctly, it was removed due to lack of vb2 convertion. If I am able to do

Re: [Mjpeg-users] bringing back media/zoran driver

On Mon, Sep 23, 2019 at 10:05:09AM +0200, Hans Verkuil wrote: > On 9/21/19 7:03 PM, Corentin Labbe wrote: > > hello > > > > I am the owner of a zoran based DC10+ card. > > I am in the need of using it since yesterday and I found that its driver > > was removed

[Mjpeg-users] [PATCH 4/5] staging: media: zoran: fix kzalloc style

Prefer kzalloc(sizeof(*prt)...) over kzalloc(sizeof(struct.../ Signed-off-by: Corentin Labbe --- drivers/staging/media/zoran/zr36016.c | 2 +- drivers/staging/media/zoran/zr36050.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/zoran/zr36016.c b

[Mjpeg-users] [PATCH 1/5] staging: media: zoran: remove detect_guest_activity

The detect_guest_activity function is no longer used, so lets removed it. Signed-off-by: Corentin Labbe --- drivers/staging/media/zoran/zoran_device.c | 46 -- drivers/staging/media/zoran/zoran_device.h | 2 - 2 files changed, 48 deletions(-) diff --git a/drivers/staging

[Mjpeg-users] [PATCH 2/5] staging: media: zoran: multiple assignments should be avoided

Remove all multiple assignments. Signed-off-by: Corentin Labbe --- drivers/staging/media/zoran/zoran_driver.c | 6 -- drivers/staging/media/zoran/zr36016.c | 3 ++- drivers/staging/media/zoran/zr36050.c | 3 ++- drivers/staging/media/zoran/zr36060.c | 3 ++- 4 files changed

[Mjpeg-users] [PATCH 5/5] staging: media: zoran: change asm header

As asked by checkpatch, convert a asm/xxx header to a linux one. Signed-off-by: Corentin Labbe --- drivers/staging/media/zoran/zr36050.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/zoran/zr36050.c b/drivers/staging/media/zoran/zr36050.c index

[Mjpeg-users] [PATCH 3/5] staging: media: zoran: remove blank line

Minor style fix by removing useless blank line. Signed-off-by: Corentin Labbe --- drivers/staging/media/zoran/zoran.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/media/zoran/zoran.h b/drivers/staging/media/zoran/zoran.h index e7fe8da7732c..b1ad2a2b914c 100644 --- a

[Mjpeg-users] [PATCH 3/8] staging: media: zoran: rename debug module parameter

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

[Mjpeg-users] [PATCH 7/8] staging: media: zoran: remove vidmem

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

[Mjpeg-users] [PATCH 2/8] staging: media: zoran: use module_pci_driver

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

[Mjpeg-users] [PATCH 6/8] staging: media: zoran: fusion all modules

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 fusion all zoran modules in one. Signed-off-by: Corentin Labbe --- drivers/staging/media/zoran/Kconfig

[Mjpeg-users] [PATCH 1/8] staging: media: zoran: move module parameter checks to zoran_probe

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

[Mjpeg-users] [PATCH 8/8] staging: media: zoran: move videodev alloc

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

[Mjpeg-users] [PATCH 4/8] staging: media: zoran: add debugfs

Add debugfs for displaying zoran debug and stats information. Signed-off-by: Corentin Labbe --- drivers/staging/media/zoran/Kconfig | 10 ++ drivers/staging/media/zoran/zoran.h | 5 +++ drivers/staging/media/zoran/zoran_card.c | 39 3 files changed, 54

[Mjpeg-users] [PATCH 5/8] staging: media: zoran: videocode: remove procfs

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 | 5 + 2 files changed, 7

[Mjpeg-users] [PATCH 0/8] staging: media: zoran: fusion in one module

Hello The main change of this serie is to fusion all zoran related modules in one. This fixes the load order problem when everything is built-in. Regards Corentin Labbe (8): staging: media: zoran: move module parameter checks to zoran_probe staging: media: zoran: use module_pci_driver

[Mjpeg-users] [PATCH v2 09/10] staging: media: zoran: move config select on primary kconfig

ned-off-by: Corentin Labbe --- drivers/staging/media/zoran/Kconfig | 23 ++- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/drivers/staging/media/zoran/Kconfig b/drivers/staging/media/zoran/Kconfig index b5a3fc6e98f6..0a9c1ab19016 100644 --- a/drivers/staging/m

[Mjpeg-users] [PATCH v2 03/10] staging: media: zoran: rename debug module parameter

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

[Mjpeg-users] [PATCH v2 06/10] staging: media: zoran: fusion all modules

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 fusion all zoran modules in one. Signed-off-by: Corentin Labbe --- drivers/staging/media/zoran/Kconfig

[Mjpeg-users] [PATCH v2 07/10] staging: media: zoran: remove vidmem

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

[Mjpeg-users] [PATCH v2 05/10] staging: media: zoran: videocode: remove procfs

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 | 5 + 2 files changed, 7

[Mjpeg-users] [PATCH v2 00/10] staging: media: zoran: fusion in one module

module - added the two latest patchs Corentin Labbe (10): staging: media: zoran: move module parameter checks to zoran_probe staging: media: zoran: use module_pci_driver staging: media: zoran: rename debug module parameter staging: media: zoran: add debugfs staging: media: zoran

[Mjpeg-users] [PATCH v2 02/10] staging: media: zoran: use module_pci_driver

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

[Mjpeg-users] [PATCH v2 10/10] staging: media: zoran: introduce zoran_i2c_init

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 | 67 ++-- 1 file changed, 51 insertions(+), 16 deletions(-) diff --git a/drivers/staging/media/zoran

[Mjpeg-users] [PATCH v2 04/10] staging: media: zoran: add debugfs

Add debugfs for displaying zoran debug and stats information. Signed-off-by: Corentin Labbe --- drivers/staging/media/zoran/Kconfig | 9 ++ drivers/staging/media/zoran/zoran.h | 4 +++ drivers/staging/media/zoran/zoran_card.c | 41 3 files changed, 54

[Mjpeg-users] [PATCH v2 01/10] staging: media: zoran: move module parameter checks to zoran_probe

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

[Mjpeg-users] [PATCH v2 08/10] staging: media: zoran: move videodev alloc

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

[Mjpeg-users] [PATCH v3 04/14] staging: media: zoran: add debugfs

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

[Mjpeg-users] [PATCH v3 02/14] staging: media: zoran: use module_pci_driver

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

[Mjpeg-users] [PATCH v3 05/14] staging: media: zoran: videocode: remove procfs

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

[Mjpeg-users] [PATCH v3 14/14] staging: media: zoran: DC30 encoder is not adv7175

The DC30 uses a non-i2c ITT MSE3000 encoder and not an adv7175 as stated in the card list. So remove adv7175 from DC30. Signed-off-by: Corentin Labbe --- drivers/staging/media/zoran/zoran_card.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/media/zoran/zoran_card.c b

[Mjpeg-users] [PATCH v3 11/14] staging: media: zoran: fix usage of vb2_dma_contig_set_max_seg_size

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

[Mjpeg-users] [PATCH v3 10/14] staging: media: zoran: introduce zoran_i2c_init

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

[Mjpeg-users] [PATCH v3 03/14] staging: media: zoran: rename debug module parameter

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

[Mjpeg-users] [PATCH v3 09/14] staging: media: zoran: move config select on primary kconfig

ned-off-by: Corentin Labbe --- drivers/staging/media/zoran/Kconfig | 23 ++- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/drivers/staging/media/zoran/Kconfig b/drivers/staging/media/zoran/Kconfig index 4067fa93d44d..faef008b8554 100644 --- a/drivers/staging/m

[Mjpeg-users] [PATCH v3 00/14] staging: media: zoran: fusion in one module

ernel test robot's reported issues on vb2_dma_contig_set_max_seg_size() Changes since v1: - add missing debugfs cleaning - clean some remaining module_get/put functions which made impossible to remove the zoran module - added the two latest patchs Corentin Labbe (14): staging: media: z

[Mjpeg-users] [PATCH v3 13/14] staging: media: zoran: fix counting buffer in reserve

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

[Mjpeg-users] [PATCH v3 07/14] staging: media: zoran: remove vidmem

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

[Mjpeg-users] [PATCH v3 06/14] staging: media: zoran: fusion all modules

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 fusion all zoran modules in one. Signed-off-by: Corentin Labbe --- drivers/staging/media/zoran/Kconfig

[Mjpeg-users] [PATCH v3 12/14] staging: media: zoran: clean unused code

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

[Mjpeg-users] [PATCH v3 08/14] staging: media: zoran: move videodev alloc

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

[Mjpeg-users] [PATCH v3 01/14] staging: media: zoran: move module parameter checks to zoran_probe

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

[Mjpeg-users] [PATCH v4 15/18] staging: media: zoran: fix various V4L2 compliance errors

ues in the format vs. what v4l2_buffer reported. 5) zero the sequence number when starting streaming. 6) drop VB_USERPTR: makes no sense with dma_contig streaming. Signed-off-by: Hans Verkuil Signed-off-by: Corentin Labbe --- drivers/staging/media/zoran/zoran_card.c | 2 +- drivers/staging/m

[Mjpeg-users] [PATCH v4 06/18] staging: media: zoran: merge all modules

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

[Mjpeg-users] [PATCH v4 03/18] staging: media: zoran: rename debug module parameter

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

[Mjpeg-users] [PATCH v4 13/18] staging: media: zoran: fix counting buffer in reserve

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

[Mjpeg-users] [PATCH v4 16/18] staging: media: zoran: fix TRY_FMT handling

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 Signe

[Mjpeg-users] [PATCH v4 04/18] staging: media: zoran: add debugfs

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

[Mjpeg-users] [PATCH v4 10/18] staging: media: zoran: introduce zoran_i2c_init

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

[Mjpeg-users] [PATCH v4 01/18] staging: media: zoran: move module parameter checks to zoran_probe

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

[Mjpeg-users] [PATCH v4 09/18] staging: media: zoran: move config select on primary kconfig

ned-off-by: Corentin Labbe --- drivers/staging/media/zoran/Kconfig | 23 ++- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/drivers/staging/media/zoran/Kconfig b/drivers/staging/media/zoran/Kconfig index 4067fa93d44d..faef008b8554 100644 --- a/drivers/staging/m

[Mjpeg-users] [PATCH v4 08/18] staging: media: zoran: move videodev alloc

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

[Mjpeg-users] [PATCH v4 18/18] staging: media: zoran: drop read/write support

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

[Mjpeg-users] [PATCH v4 11/18] staging: media: zoran: fix usage of vb2_dma_contig_set_max_seg_size

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

[Mjpeg-users] [PATCH v4 07/18] staging: media: zoran: remove vidmem

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

[Mjpeg-users] [PATCH v4 12/18] staging: media: zoran: clean unused code

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

[Mjpeg-users] [PATCH v4 17/18] staging: media: zoran: drop kernel log spam

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

[Mjpeg-users] [PATCH v4 14/18] staging: media: zoran: calculate the right buffer number for zoran_reap_stat_com

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 chang

[Mjpeg-users] [PATCH v4 02/18] staging: media: zoran: use module_pci_driver

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

[Mjpeg-users] [PATCH v4 05/18] staging: media: zoran: videocode: remove procfs

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

[Mjpeg-users] [PATCH v4 00/18] staging: media: zoran: merge in one module

x_seg_size() Changes since v1: - add missing debugfs cleaning - clean some remaining module_get/put functions which made impossible to remove the zoran module - added the two latest patchs Corentin Labbe (14): staging: media: zoran: move module parameter checks to zoran_probe staging: media: