Skip to content

staging: media: bring back zoran driver

Corentin Labbe linux-media lkml 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest47 patches 6 repliesIn review
  2. v149 patches 6 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/47staging: media: Revert "media: zoran: remove deprecated driver"Documentation/media/v4l-drivers/zoran.rst drivers/staging/media/Kconfig drivers/staging/media/zoran/Kconfig +19 more+11284 -01 reply
2/47MAINTAINERS: change maintainer of the zoran driverDocumentation/media/v4l-drivers/zoran.rst MAINTAINERS drivers/staging/media/zoran/zoran_card.c +3 more+17 -350 replies
3/47staging: media: zoran: datasheet is no longer available from zoran.comdrivers/staging/media/zoran/zoran_device.c+0 -30 replies
4/47staging: media: zoran: Documentation: fix typoDocumentation/media/v4l-drivers/zoran.rst+2 -20 replies
5/47staging: media: zoran: fix checkpatch issuedrivers/staging/media/zoran/videocodec.c drivers/staging/media/zoran/videocodec.h drivers/staging/media/zoran/zoran.h +13 more+740 -13760 replies
6/47staging: media: zoran: do not forward declare zr36057_init_vfedrivers/staging/media/zoran/zoran_device.c+21 -230 replies
7/47staging: media: zoran: convert all error dprintk to pci_err/pr_errdrivers/staging/media/zoran/videocodec.c drivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_device.c +5 more+145 -4290 replies
8/47staging: media: zoran: convert dprintk warndrivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_device.c drivers/staging/media/zoran/zoran_driver.c+14 -460 replies
9/47staging: media: zoran: convert dprintk info to pci_infodrivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_device.c drivers/staging/media/zoran/zoran_driver.c+36 -710 replies
10/47staging: media: zoran: convert dprintk debugdrivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_card.h drivers/staging/media/zoran/zoran_device.c +1 more+21 -450 replies
11/47staging: media: zoran: zoran_device.c: convert pr_x to pci_xdrivers/staging/media/zoran/zoran_device.c+5 -61 reply
12/47staging: media: zoran: remove proc_fsdrivers/staging/media/zoran/Makefile drivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_card.c +4 more+1 -2590 replies
13/47staging: media: zoran: use VFL_TYPE_VIDEOdrivers/staging/media/zoran/zoran_card.c+1 -10 replies
14/47staging: media: zoran: use v4l2_buffer_set_timestampdrivers/staging/media/zoran/zoran_driver.c+2 -20 replies
15/47staging: media: zoran: do not print random guest 0drivers/staging/media/zoran/zoran_device.c+7 -00 replies
16/47staging: media: zoran: move buffer_size out of zoran_fhdrivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_device.c drivers/staging/media/zoran/zoran_driver.c+35 -330 replies
17/47staging: media: zoran: move v4l_settings out of zoran_fhdrivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_driver.c+17 -220 replies
18/47staging: media: zoran: move jpg_settings out of zoran_fhdrivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_driver.c+47 -580 replies
19/47staging: media: zoran: move overlay_settings out of zoran_fhdrivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_device.c drivers/staging/media/zoran/zoran_driver.c+21 -280 replies
20/47staging: media: zoran: Use video_drvdata to get struct zorandrivers/staging/media/zoran/zoran_driver.c+14 -260 replies
21/47staging: media: zoran: Change zoran_v4l_set_format parameter from zoran_fh to zorandrivers/staging/media/zoran/zoran_driver.c+2 -40 replies
22/47staging: media: zoran: remove overlaydrivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_device.c +1 more+12 -4820 replies
23/47staging: media: zoran: Use DMA coherent for stat_comdrivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_device.c+18 -90 replies
24/47staging: media: zoran: use ZR_NORMdrivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_driver.c+11 -70 replies
25/47staging: media: zoran: zoran does not support STD_ALLdrivers/staging/media/zoran/zoran_driver.c+1 -10 replies
26/47staging: media: zoran: convert irq to pci irqdrivers/staging/media/zoran/zoran_card.c+3 -40 replies
27/47staging: media: zoran: convert zoran alloc to devmdrivers/staging/media/zoran/zoran_card.c+1 -30 replies
28/47staging: media: zoran: convert mdelay to udelaydrivers/staging/media/zoran/zoran_device.c+2 -21 reply
29/47staging: media: zoran: use devm for videocodec_master allocdrivers/staging/media/zoran/zoran_card.c+5 -170 replies
30/47staging: media: zoran: use pci_request_regionsdrivers/staging/media/zoran/zoran_card.c+8 -10 replies
31/47staging: media: zoran: use devm_ioremapdrivers/staging/media/zoran/zoran_card.c+2 -50 replies
32/47staging: media: zoran: add stat_com bufferdrivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_card.c+14 -10 replies
33/47staging: media: zoran: constify struct tvnormdrivers/staging/media/zoran/videocodec.h drivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_card.c +4 more+22 -220 replies
34/47staging: media: zoran: constify codec_namedrivers/staging/media/zoran/zoran_card.c+3 -30 replies
35/47staging: media: zoran: Add more check for compliancedrivers/staging/media/zoran/zoran_driver.c+17 -00 replies
36/47staging: media: zoran: Add vb_queuedrivers/staging/media/zoran/Kconfig drivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_card.c +1 more+271 -00 replies
37/47staging: media: zoran: disable outputdrivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_driver.c+14 -80 replies
38/47staging: media: zoran: device support only 32bit DMA addressdrivers/staging/media/zoran/zoran_card.c+6 -00 replies
39/47staging: media: zoran: enable makefiledrivers/staging/media/Makefile+1 -00 replies
40/47staging: media: zoran: remove framebuffer supportdrivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_driver.c+0 -950 replies
41/47staging: media: zoran: add vidioc_g_parmdrivers/staging/media/zoran/zoran_driver.c+9 -00 replies
42/47staging: media: zoran: remove test_interruptsdrivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_device.c+0 -460 replies
43/47staging: media: zoran: fix use of buffer_size and sizeimagedrivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_driver.c+8 -30 replies
44/47staging: media: zoran: fix some compliance testdrivers/staging/media/zoran/zoran_driver.c+11 -10 replies
45/47staging: media: zoran: remove deprecated .vidioc_g_jpegcompdrivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_driver.c+22 -490 replies
46/47staging: media: zoran: convert to vb2drivers/staging/media/zoran/Kconfig drivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_card.c +2 more+137 -19340 replies
47/47staging: media: zoran: update TODOdrivers/staging/media/zoran/TODO+19 -40 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH RFT/RFC v2 00/47] staging: media: bring back zoran driver

Hello

The zoran driver was removed in 5.3
The main reason of the removing was lack of motivation to convert it to VB2
Since I need it, I worked on bringing it back.

So the plan to achieve it was:
- clean up the coding style.
- convert old usage/API
- clean unused code
- convert to VB2

I have tried to split a bit the VB2 patch (by adding/removing code in another patch), but the result is unfortunately still a big patch.

The result of this serie is a working zoran driver. Furthermore it is now compliant to v4l-compliance.

In the process some old (useless) feature (fbuf, overlay) was removed for simplifying maintenance.

The zoran hardware support MJPEG decompression, but this feature is temporarily disabled by this serie.
But basically, this feature was unusable, since the only tool which permitted to use it was a mplayer option.
But this mplayer option no longer compile (probably since a long time) and is such a hack (a copy of some private ffmpeg structure) that it is unfixable.
Happily, when I started to work on zoran, a patch was posted on ffmpeg ML which permit it to output non-raw video stream (and so MJPEG for zoran case).
But the zoran hw does not like some part of JPEG header it receives, so a filter need to be written.
Anyway, this disabling is not a regression, since this feature was not usable since a long time.

Since the driver was in staging, I targeted staging, but probably the driver is in a sufficient good shape to target media and bypass staging.

This driver is tested on a DC10+ (on x86). Tests on different hardware are welcome.

I would like to thanks all people that helped me to achieve this (mostly #v4l)

Regards

PS: this serie is resent a bit soon since linux-media didnt get some patch and cover letter

Changes since RFC1
- removed fallthough patch
- removed unsplit lines patch
- fixed line size in "Use DMA coherent for stat_com" patch

Corentin Labbe (47):
staging: media: Revert "media: zoran: remove deprecated driver"
MAINTAINERS: change maintainer of the zoran driver
staging: media: zoran: datasheet is no longer available from zoran.com
staging: media: zoran: Documentation: fix typo
staging: media: zoran: fix checkpatch issue
staging: media: zoran: do not forward declare zr36057_init_vfe
staging: media: zoran: convert all error dprintk to pci_err/pr_err
staging: media: zoran: convert dprintk warn
staging: media: zoran: convert dprintk info to pci_info
staging: media: zoran: convert dprintk debug
staging: media: zoran: zoran_device.c: convert pr_x to pci_x
staging: media: zoran: remove proc_fs
staging: media: zoran: use VFL_TYPE_VIDEO
staging: media: zoran: use v4l2_buffer_set_timestamp
staging: media: zoran: do not print random guest 0
staging: media: zoran: move buffer_size out of zoran_fh
staging: media: zoran: move v4l_settings out of zoran_fh
staging: media: zoran: move jpg_settings out of zoran_fh
staging: media: zoran: move overlay_settings out of zoran_fh
staging: media: zoran: Use video_drvdata to get struct zoran
staging: media: zoran: Change zoran_v4l_set_format parameter from
zoran_fh to zoran
staging: media: zoran: remove overlay
staging: media: zoran: Use DMA coherent for stat_com
staging: media: zoran: use ZR_NORM
staging: media: zoran: zoran does not support STD_ALL
staging: media: zoran: convert irq to pci irq
staging: media: zoran: convert zoran alloc to devm
staging: media: zoran: convert mdelay to udelay
staging: media: zoran: use devm for videocodec_master alloc
staging: media: zoran: use pci_request_regions
staging: media: zoran: use devm_ioremap
staging: media: zoran: add stat_com buffer
staging: media: zoran: constify struct tvnorm
staging: media: zoran: constify codec_name
staging: media: zoran: Add more check for compliance
staging: media: zoran: Add vb_queue
staging: media: zoran: disable output
staging: media: zoran: device support only 32bit DMA address
staging: media: zoran: enable makefile
staging: media: zoran: remove framebuffer support
staging: media: zoran: add vidioc_g_parm
staging: media: zoran: remove test_interrupts
staging: media: zoran: fix use of buffer_size and sizeimage
staging: media: zoran: fix some compliance test
staging: media: zoran: remove deprecated .vidioc_g_jpegcomp
staging: media: zoran: convert to vb2
staging: media: zoran: update TODO

 Documentation/media/v4l-drivers/zoran.rst  |  575 +++++++++
 MAINTAINERS                                |   10 +
 drivers/staging/media/Kconfig              |    2 +
 drivers/staging/media/Makefile             |    1 +
 drivers/staging/media/zoran/Kconfig        |   76 ++
 drivers/staging/media/zoran/Makefile       |    7 +
 drivers/staging/media/zoran/TODO           |   19 +
 drivers/staging/media/zoran/videocodec.c   |  330 +++++
 drivers/staging/media/zoran/videocodec.h   |  308 +++++
 drivers/staging/media/zoran/zoran.h        |  320 +++++
 drivers/staging/media/zoran/zoran_card.c   | 1333 ++++++++++++++++++++
 drivers/staging/media/zoran/zoran_card.h   |   30 +
 drivers/staging/media/zoran/zoran_device.c | 1013 +++++++++++++++
 drivers/staging/media/zoran/zoran_device.h |   64 +
 drivers/staging/media/zoran/zoran_driver.c | 1038 +++++++++++++++
 drivers/staging/media/zoran/zr36016.c      |  433 +++++++
 drivers/staging/media/zoran/zr36016.h      |   92 ++
 drivers/staging/media/zoran/zr36050.c      |  842 +++++++++++++
 drivers/staging/media/zoran/zr36050.h      |  163 +++
 drivers/staging/media/zoran/zr36057.h      |  154 +++
 drivers/staging/media/zoran/zr36060.c      |  872 +++++++++++++
 drivers/staging/media/zoran/zr36060.h      |  201 +++
 22 files changed, 7883 insertions(+)
 create mode 100644 Documentation/media/v4l-drivers/zoran.rst
 create mode 100644 drivers/staging/media/zoran/Kconfig
 create mode 100644 drivers/staging/media/zoran/Makefile
 create mode 100644 drivers/staging/media/zoran/TODO
 create mode 100644 drivers/staging/media/zoran/videocodec.c
 create mode 100644 drivers/staging/media/zoran/videocodec.h
 create mode 100644 drivers/staging/media/zoran/zoran.h
 create mode 100644 drivers/staging/media/zoran/zoran_card.c
 create mode 100644 drivers/staging/media/zoran/zoran_card.h
 create mode 100644 drivers/staging/media/zoran/zoran_device.c
 create mode 100644 drivers/staging/media/zoran/zoran_device.h
 create mode 100644 drivers/staging/media/zoran/zoran_driver.c
 create mode 100644 drivers/staging/media/zoran/zr36016.c
 create mode 100644 drivers/staging/media/zoran/zr36016.h
 create mode 100644 drivers/staging/media/zoran/zr36050.c
 create mode 100644 drivers/staging/media/zoran/zr36050.h
 create mode 100644 drivers/staging/media/zoran/zr36057.h
 create mode 100644 drivers/staging/media/zoran/zr36060.c
 create mode 100644 drivers/staging/media/zoran/zr36060.h
Signature · 1 line
2.26.2