Mauro Carvalho Chehab
c602f29dd1
media: zoran: fix mixed case on vars
...
Use this small script to replace CamelCase and wrong case
on vars:
<script>
FILES=$(find "$1" -type f|grep -e '.c$' -e '.h$')
CAMEL_VARS=$(cat tags|perl -ne 'print "$1\n" if (m/^(\w*[A-Z]\w*[a-z]\w*)\s/)')
for i in $CAMEL_VARS; do
new=$(perl -e '
my $s = $ARGV[0];
$s =~ s{([^a-zA-Z]?)([A-Z]*)([A-Z])([a-z]?)}{
my $fc = pos($s)==0;
my ($p0,$p1,$p2,$p3) = ($1,lc$2,lc$3,$4);
my $t = $p0 || $fc ? $p0 : '_';
$t .= $p3 ? $p1 ? "${p1}_$p2$p3" : "$p2$p3" : "$p1$p2";
$t;
}ge;
print $s;' "$i")
for j in $FILES; do
sed -E "s,\b$i\b,$new,g" -i $j
done
done
for i in $(git grep "#define zr" drivers/staging/media/zoran/*.[ch]|perl -ne 'print "$1\n" if (m/#define\s+(zr\S+)/)'); do j=$(echo $i|tr [a-z] [A-Z]); sed "s,\b$i\b,$j,g" -i drivers/staging/media/zoran/*.[ch]; done
</script>
This should solve almost all warnings reported by checkpatch.pl
in strict mode.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 11:27:28 +02:00
Mauro Carvalho Chehab
209ecc56aa
media: zoran: get rid of an unused var
...
The jpeg_error in lowercase is not used anywhere. Drop it.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 11:18:26 +02:00
Mauro Carvalho Chehab
0568d6c20e
media: zoran: use upper case for card types
...
Don't mix case there: let's just use uppercase, as this is
the common pattern for such define-like enums.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 11:00:29 +02:00
Hans Verkuil
05b837920f
media: zoran: fix sparse warnings
...
The output is not fully supported yet, so some ops are
commented out. Also comment out the corresponding callbacks to prevent
these sparse warnings:
drivers/staging/media/zoran/zoran_driver.c:656:12: warning: 'zoran_s_output' defined but not used [-Wunused-function]
656 | static int zoran_s_output(struct file *file, void *__fh, unsigned int output)
| ^~~~~~~~~~~~~~
drivers/staging/media/zoran/zoran_driver.c:649:12: warning: 'zoran_g_output' defined but not used [-Wunused-function]
649 | static int zoran_g_output(struct file *file, void *__fh, unsigned int *output)
| ^~~~~~~~~~~~~~
drivers/staging/media/zoran/zoran_driver.c:635:12: warning: 'zoran_enum_output' defined but not used [-Wunused-function]
635 | static int zoran_enum_output(struct file *file, void *__fh,
| ^~~~~~~~~~~~~~~~~
drivers/staging/media/zoran/zoran_driver.c:302:12: warning: 'zoran_enum_fmt_vid_overlay' defined but not used [-Wunused-function]
302 | static int zoran_enum_fmt_vid_overlay(struct file *file, void *__fh,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/staging/media/zoran/zoran_driver.c:294:12: warning: 'zoran_enum_fmt_vid_out' defined but not used [-Wunused-function]
294 | static int zoran_enum_fmt_vid_out(struct file *file, void *__fh,
| ^~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 10:06:39 +02:00
Hans Verkuil
72c51be87f
media: zoran: fix smatch warning
...
drivers/staging/media/zoran/zoran_device.c:941 zoran_irq() warn: inconsistent indenting
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 10:06:16 +02:00
Corentin Labbe
6dee18f727
media: zoran: update TODO
...
Update the TODO of the zoran driver
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 10:05:55 +02:00
Corentin Labbe
83f89a8bcb
media: zoran: convert to vb2
...
This is it! the ultimate last step, the vb2 conversion.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 10:05:09 +02:00
Corentin Labbe
8cb356d4ea
media: zoran: remove deprecated .vidioc_g_jpegcomp
...
Remove the deprecated .vidioc_g_jpegcomp and replace it
with corresponding v4l2_ctrl_ops code.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 10:04:35 +02:00
Corentin Labbe
d1d015376c
media: zoran: fix some compliance test
...
Add TODO for "TRY_FMT cannot handle an invalid pixelformat"
We need to set pixelformat in some case.
We should also handle some minimum requirement.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 10:03:28 +02:00
Corentin Labbe
11c9c16f7c
media: zoran: fix use of buffer_size and sizeimage
...
buffer_size was not set when it should be.
Furthermore, use it instead of recalculate it.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 10:02:56 +02:00
Corentin Labbe
64868edc96
media: zoran: remove test_interrupts
...
The test_interrupts function is useless, remove it.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 10:02:29 +02:00
Corentin Labbe
10e75b6ecd
media: zoran: add vidioc_g_parm
...
Adding vidioc_g_parm made v4l compliance happy.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 10:02:02 +02:00
Corentin Labbe
991a020732
media: zoran: remove framebuffer support
...
The framebuffer support is obsolete, so let's reduce code size.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 10:01:38 +02:00
Corentin Labbe
2f0ee19bf2
media: zoran: enable makefile
...
This patch enables compilation of the zoran driver.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 10:01:14 +02:00
Corentin Labbe
d4ae368922
media: zoran: device support only 32bit DMA address
...
The zoran device only supports 32bit DMA address.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 10:00:55 +02:00
Corentin Labbe
b8fb0a4740
media: zoran: disable output
...
Zoran is picky about jpeg data it accepts. At least it seems to not support COM and APPn.
So until a way to filter data will be done, disable output.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 10:00:32 +02:00
Corentin Labbe
b564cb6e0b
media: zoran: Add vb_queue
...
This patchs adds a vb_queue without using it.
This reduce the final VB2 conversion patch.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:59:38 +02:00
Corentin Labbe
1c3629cba0
media: zoran: Add more check for compliance
...
The zoran driver miss some sanity checks, and this made v4l compliance
happy.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:59:01 +02:00
Corentin Labbe
d61c7451fc
media: zoran: constify codec_name
...
The codec_name could be const.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:58:10 +02:00
Corentin Labbe
4ea8b196a7
media: zoran: constify struct tvnorm
...
The structure tvnorm could be consified.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:57:48 +02:00
Corentin Labbe
30a978180a
media: zoran: add stat_com buffer
...
Adds the allocation of the stat_com buffer which be used later.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:57:17 +02:00
Corentin Labbe
e83bf68b58
media: zoran: use devm_ioremap
...
Using devm_ioremap simplify code.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:56:40 +02:00
Corentin Labbe
845556fd80
media: zoran: use pci_request_regions
...
Use pci_request_regions so now we can see zoran in /proc/iomem.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:56:17 +02:00
Corentin Labbe
4bae5db2f2
media: zoran: use devm for videocodec_master alloc
...
Let's use devm allocations for videocodec, this simplify code.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:55:31 +02:00
Corentin Labbe
af71064bc4
media: zoran: convert mdelay to udelay
...
As asked by checkpath, let's use udelay.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:55:01 +02:00
Corentin Labbe
6d1d9ba2c4
media: zoran: convert zoran alloc to devm
...
Allocate the zoran structure with devm_ functions permit to simplify
code.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:48:42 +02:00
Corentin Labbe
ce72671d5d
media: zoran: convert irq to pci irq
...
This patch convert zoran to pci_irq functions.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:43:06 +02:00
Corentin Labbe
799cb9e3c1
media: zoran: zoran does not support STD_ALL
...
In fact, zoran does not support V4L2_STD_ALL, so let's enumerate what we
support.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:42:40 +02:00
Corentin Labbe
7b1f41e037
media: zoran: use ZR_NORM
...
Instead of using hardcoded numbers, let's use some define for ZR NORM.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:42:11 +02:00
Corentin Labbe
886986804a
media: zoran: Use DMA coherent for stat_com
...
Instead of using a fragile virt_to_bus, let's use proper DMA coherent
for the stat_com entry.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:41:41 +02:00
Corentin Labbe
accd021409
media: zoran: remove overlay
...
Supporting overlay is not necessary today, so let's reduce the code size
by removing it.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:40:51 +02:00
Corentin Labbe
000ffb5ec6
media: zoran: Change zoran_v4l_set_format parameter from zoran_fh to zoran
...
We need to get rid of zoran_fh, so let's change function arguments.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:40:25 +02:00
Corentin Labbe
cd669be210
media: zoran: Use video_drvdata to get struct zoran
...
Using video_drvdata() is proper and shorter than using directly
fh pointers.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:39:59 +02:00
Corentin Labbe
109d5cc0d0
media: zoran: move overlay_settings out of zoran_fh
...
We need to get rid of zoran_fh, so move the overlay_settings directly in the
zoran structure.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:39:22 +02:00
Corentin Labbe
66a9b5a82f
media: zoran: move jpg_settings out of zoran_fh
...
We need to get rid of zoran_fh, so move the jpg_settings directly in the
zoran structure.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:38:54 +02:00
Corentin Labbe
dc5f0b5d2d
media: zoran: move v4l_settings out of zoran_fh
...
We need to get rid of zoran_fh, so move the v4l_settings directly in the
zoran structure.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:38:31 +02:00
Corentin Labbe
7847f74d36
media: zoran: move buffer_size out of zoran_fh
...
We need to get rid of zoran_fh, so move the buffer_size directly in the
zoran structure.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:38:05 +02:00
Corentin Labbe
62d297ede7
media: zoran: do not print random guest 0
...
The slot 0 of guest is never initialized and so we print later random
data.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:37:37 +02:00
Corentin Labbe
e2b35ed6af
media: zoran: use v4l2_buffer_set_timestamp
...
The ns_to_timeval function is removed, so replace it with
v4l2_buffer_set_timestamp().
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:37:11 +02:00
Corentin Labbe
3f2c342362
media: zoran: use VFL_TYPE_VIDEO
...
The VFL_TYPE_GRABBER type was removed, so let's use the new type.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:36:48 +02:00
Corentin Labbe
72b23dd245
media: zoran: remove proc_fs
...
The zoran driver give some debug information in procfs, but this is not
the right place.
So let's remove them, we will use debugfs later.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:36:30 +02:00
Corentin Labbe
ff559599a3
media: zoran: zoran_device.c: convert pr_x to pci_x
...
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:36:07 +02:00
Corentin Labbe
daae1da762
media: zoran: convert dprintk debug
...
This patch convert dprintk(debug) to pci_dbg.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:35:44 +02:00
Corentin Labbe
9bb2720293
media: zoran: convert dprintk info to pci_info
...
This patch convert dprintk(info) to pci_info (or pci_dbg if the message
is not important).
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:35:14 +02:00
Corentin Labbe
28ea0148cf
media: zoran: convert dprintk warn
...
This patch convert dprintk(warn) to pci_warn.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:34:45 +02:00
Corentin Labbe
b7c3b2bb9d
media: zoran: convert all error dprintk to pci_err/pr_err
...
This patch converts all errors dprintk to pci_err/pr_err.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:34:14 +02:00
Corentin Labbe
c638913669
media: zoran: do not forward declare zr36057_init_vfe
...
move function for avoiding forward declaration
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:33:36 +02:00
Corentin Labbe
5e195bbdda
media: zoran: fix checkpatch issue
...
Fix a lot of style issue found by checkpatch.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:32:50 +02:00
Corentin Labbe
874edaa5d5
media: zoran: Documentation: fix typo
...
Fix some typo in doc.
[hverkuil: The TV encoder are -> The TV encoder is]
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:31:33 +02:00
Corentin Labbe
a7fd03f552
media: zoran: datasheet is no longer available from zoran.com
...
Simply remove this broken reference
Signed-off-by: Corentin Labbe <clabbe@baylibre.com >
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl >
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org >
2020-10-01 09:31:11 +02:00