Commit Graph

916150 Commits

Author SHA1 Message Date
Mauro Carvalho Chehab
4dcf78197a media: atomisp: get rid of unused header files
Those 4 header files aren't used anyware. So, send them to
the trash can.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:17 +02:00
Mauro Carvalho Chehab
8fba22fbdf media: atomisp: get rid of trivial ISP2401 dependencies on header files
On several header files, the dependency for ISP2401 is
trivial: for example, it just adds new fields on structs or
declare new functions.

Get rid of those trivial cases.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:17 +02:00
Mauro Carvalho Chehab
d4cf9939a6 media: atomisp: get rid of several typedef-style defines
Those vars aren't used anymore at this driver. Get rid of
them.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:17 +02:00
Mauro Carvalho Chehab
badd9b3a95 media: atomisp: isp_const.h: get rid of an unused big define list
None of those SH_CSS_BINARY_ID_* symbols are used by this driver
anymore. So, get rid of all of them.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:17 +02:00
Mauro Carvalho Chehab
406ae76079 media: atomisp: sh_css: detect ISP version at runtime
Get rid of all those ifdefs that were checking for ISP2401 inside
sh_css.c.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:17 +02:00
Mauro Carvalho Chehab
7535c68d17 media: atomisp: make util.c work with ISP2401 runtime detection
Don't hide those small functions behind ifdefs.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:17 +02:00
Mauro Carvalho Chehab
8a85fe11c2 media: atomisp: get rid of some non-existing functions for ISP2401
There are no ia_css_set_system_mode() nor
ia_css_is_system_mode_suspend_or_resume() functions at the driver.

So, get rid of the code that would try to call it.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:17 +02:00
Mauro Carvalho Chehab
c06e212da0 media: atomisp: ia_css_binary_get_shading_info(): don't test version
It doesn't make any sense to change the number of parameters
for this function depending on the ISP version.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:17 +02:00
Mauro Carvalho Chehab
bd3016e924 media: atomisp: css_trace.h: use the newest tracing code
The css_trace header for ISP2401 also builds on older versions, and
seems to be compatible with all versions. So, remove all ifdefs
in favor of the CSP2401 version.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:17 +02:00
Mauro Carvalho Chehab
1c874c13cd media: atomisp: add support for possible new names
This patch addresses what it sounds to be a change at the
name of some ACPI registers on newer ACPI tables.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:17 +02:00
Mauro Carvalho Chehab
fe670b2a79 media: atomisp: print css_version in runtime
The CSS version returned by ISP2400 is different than the one
returned by ISP2401.

While we could return just one version for both, as this sounds
like just an informative string, for now, let's keep returning
different versions, as we don't know if this would affect
userspace.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:17 +02:00
Mauro Carvalho Chehab
1e972929f0 media: atomisp: sh_css_param_dvs.h remove ISP version macros
As namespaces aren't duplicated here, just remove the ifdefs.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:16 +02:00
Mauro Carvalho Chehab
19801a18a0 media: atomisp: unify sh_css_params_shading_id_table_generate()
Instead of packing parameters differently on ISP2400 and ISP2401,
use just one way of passing them for both.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:16 +02:00
Mauro Carvalho Chehab
5e0947450d media: atomisp: remove table duplication from dfs tables
The way atomisp_dfs_tables.h is defined, it ends by duplicating
all data structs there on both atomisp_v4l2.c and atomisp_cmd.c.

Change the logic in order to place the definitions only on a single
place.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:16 +02:00
Mauro Carvalho Chehab
6a2782c0b2 media: atomisp: remove ISP version macros from sh_css_legacy.h
This header is really version-independent. So, just get rid
of the macros from it.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:16 +02:00
Mauro Carvalho Chehab
4f744a573d media: atomisp: make sh_css_sp_init_pipeline() ISP version independent
This function call has two parameters that are used only with
ISP2401, enclosed on some ugly ifdefs. Make the function independent,
passing NULL values for ISP2400.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:16 +02:00
Mauro Carvalho Chehab
977e77c0b5 media: atomisp: make sh_css_struct.h independent of ISP version
Use the same struct for both ISP2400 and ISP2401.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:16 +02:00
Mauro Carvalho Chehab
ffa123612a media: atomisp: sh_css_defs.h: get rid of build time dependencies
There are several #ifdefs checking for ISP version there. Some
of them are just two different ways to represent the same contants,
while 3 parameters are actually different, depending on the ISP
version.

Change the header in a way that it will be compatible with both
versions, and change dependent code to keep running, removing
ifdefs there only when possible.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:16 +02:00
Mauro Carvalho Chehab
483f5215a2 media: atomisp: atomisp_compat_ioctl32.c: be independent of ISP version
There are two ioctls that are only available with ISP2401. Yet,
at the compat level, we don't really need to take care, as
the native ioctl handler will already return an error code if
the ioctl doesn't exist.

So, let's just remove the ifdefs here.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:16 +02:00
Mauro Carvalho Chehab
7ef17aa55f media: atomisp: atomisp_compat_css20.c: detect ISP at runtime
Remove ifdefs that check ISP version from the code, switching
to specific ISP-dependent code at runtime.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:16 +02:00
Mauro Carvalho Chehab
78e2888ccb media: atomisp: atomisp_csi2.c: remove useless ifdefs
The ifdefs there are meaningless. Just remove them for good.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:16 +02:00
Mauro Carvalho Chehab
02c392332c media: atomisp: atomisp_subdev.c check ISP version on runtime
Remove ISP-version-dependent ifdefs.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:16 +02:00
Mauro Carvalho Chehab
a19b190e32 media: atomisp: atomisp_v4l2.c: set wdt timers according with ISP version
Add a runtime check to use the proper wdt timer init at runtime,
depending on the chipset revision.

For now, we can't get rid of the remaining version checks, as
the rest of the code is not prepared yet to detect the ISP
version on runtime.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:16 +02:00
Mauro Carvalho Chehab
9ace178dee media: atomisp: atomisp_ioctl.c: get rid of a ISP2400/ISP2401 dependency
Replace #ifdef occurrences there with runtime checks.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:16 +02:00
Mauro Carvalho Chehab
643405b0ff media: atomisp: pci/atomisp2/*.h remove #ifdef ISP2401
Those ifs can easily be removed without breaking the code.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:16 +02:00
Mauro Carvalho Chehab
268ff5bf6b media: atomisp: atomisp_dfs_tables.h: don't depend on ISP version
There's a dependency on this header for the ISP model. While
this sounds really weird (as just one resolution needs it),
as we don't know what's the right value, let's just keep it.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:16 +02:00
Mauro Carvalho Chehab
ea419fdae5 media: atomisp: atomisp_cmd.c test ISP version in runtime
The logic there has lots of ifdef dependencies if the hardware
is either ISP2400 or ISP2041.

Replace them by runtime checks.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:16 +02:00
Mauro Carvalho Chehab
e1ac35b39a media: atomisp: add a way for the driver to know the chipset version
The atomisp supports two different chipsets: ISP2400 and ISP2401.
Right now, this is controlled by ugly #defines inside the driver.

Add a global bolean to identify the type of hardware. While this
is hacky, it would be a quick way to start removing the ugly
ifdefs.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:15 +02:00
Mauro Carvalho Chehab
9a0d7fb5ec media: atomisp: simplify math_support.h
There are some uneeded defines there. Simplify it, and make
it independent of defines.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:15 +02:00
Mauro Carvalho Chehab
02330fb010 media: atomisp: remove some dead code
There are several parts of atomisp that are meant to be
built on different environments, tested using ifdefs.

Remove some of them, as this code should build only on
Linux.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:15 +02:00
Mauro Carvalho Chehab
eaa399eb54 media: atomisp: do lots of other coding style cleanups
Use some auto-reformat tools to make the atomisp style
a little better. There are still lots of weird things there,
but this will hopefully reduce the number of pure coding
style patches submitted upstream.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:15 +02:00
Mauro Carvalho Chehab
bdfe0beb95 media: atomisp: fix several coding style issues
Use checkpatch.pl --fix-inplace --strict to solve several
coding style issues, manually reviewing the produced code and
fixing some troubles caused by checkpatch.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:15 +02:00
Mauro Carvalho Chehab
4636a85cff media: atomisp: fix several typos
Running checkpatch.pl codespell logic found several typos at atomisp
driver.

Fix them using --fix-inline.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:15 +02:00
Mauro Carvalho Chehab
fd3218f513 media: atomisp: select IOSF_MBI dependency
This driver needs IOSF_MBI in order to talk with some PM
registers. Select it at compile time.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:15 +02:00
Mauro Carvalho Chehab
aa31f65140 media: atomisp: allow building the driver again
The atomisp driver builds again. So, remove depends on BROKEN.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:14 +02:00
Mauro Carvalho Chehab
e7b955f8e0 media: atomisp: fix a broken compat32 code
There's a typo at the compat32 code, with forgot to get the
pointer address, causing the driver to not build.

Not sure why this didn't produce an error back when the
driver got removed.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:14 +02:00
Mauro Carvalho Chehab
c1b70ae094 media: atomisp: use new ida API
The old ida API got replaced by a new one, with avoids
locking issues. As the old API was removed, start using the
new one, as defined by changeset b03f8e43c9 ("ida: Remove old API").

Fixes: b03f8e43c9 ("ida: Remove old API")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:14 +02:00
Mauro Carvalho Chehab
8d564cd28c media: atomisp: use cpu_latency_qos_*() instead of pm_qos_update*()
Those functions got renamed. Update them on atomisp driver.

Fixes: 67b06ba018 ("PM: QoS: Drop PM_QOS_CPU_DMA_LATENCY and rename related functions")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:14 +02:00
Mauro Carvalho Chehab
a9d7bbcc6b media: atomisp: Fix support for time 64 API
The time 64 API patchset changed the ts stamp to u64.

Update this driver accordingly.

Fixes: 15a40b27be ("media: videobuf: use u64 for the timestamp internally")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:14 +02:00
Mauro Carvalho Chehab
e58eeb5a73 media: atomisp: replace VFL_TYPE_GRABBER by VFL_TYPE_VIDEO
This type was renamed in the past by a more meaningul
name. Change it on atomisp too.

Fixes: 238e4a5baa ("media: rename VFL_TYPE_GRABBER to _VIDEO")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:14 +02:00
Mauro Carvalho Chehab
1aeb9583d3 media: atomisp: totalram_pages is now a function
Fix the usage of totalram_pages, as this is now a function.

Fixes: ca79b0c211 ("mm: convert totalram_pages and totalhigh_pages variables to atomic")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:14 +02:00
Mauro Carvalho Chehab
60e5c18945 media: atomisp: fix usage of access_ok() kAPI
This macro had its first parameter lost. Remove it.

While on it, fix the alignments where this macro is used.

Fixes: 96d4f267e4 ("Remove 'type' argument from access_ok() function")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:14 +02:00
Mauro Carvalho Chehab
99da46648a MAINTAINERS: adjust atomisp maintainership
From now on, I'll be maintaining the atomisp driver, and
Sakari will be reviewing it.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:32:14 +02:00
Mauro Carvalho Chehab
ad85094b29 Revert "media: staging: atomisp: Remove driver"
There are some interest on having this driver back, and I
can probably dedicate some time to address its issue. So,
let's ressurect it.

For now, the driver causes a recursive error and doesn't
build, so, make it depend on BROKEN.

This reverts commit 51b8dc5163.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-20 12:26:12 +02:00
Jacopo Mondi
ad3a44cbd1 media: i2c: imx219: Parse and register properties
Parse device properties and register controls for them using the newly
introduced helpers.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-18 15:37:16 +02:00
Jacopo Mondi
74c3ddd988 media: i2c: ov13858: Parse and register properties
Parse device properties and register controls for them using the newly
introduced helpers.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-18 15:36:58 +02:00
Jacopo Mondi
eba08021e1 media: i2c: ov5670: Parse and register properties
Parse device properties and register controls for them using the newly
introduced helpers.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-18 15:36:37 +02:00
Jacopo Mondi
e0a360630d media: v4l2-ctrls: Add helper to register properties
Add an helper function to v4l2-ctrls to register controls associated
with a device property.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-18 15:36:20 +02:00
Jacopo Mondi
e0837a6c08 media: v4l2-ctrls: Sort includes alphabetically
Before adding a new include directive, sort the existing ones in
alphabetical order.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-18 15:35:53 +02:00
Jacopo Mondi
ae6ff16cf7 media: include: v4l2-ctrl: Sort forward declarations
Before adding a new forward declaration to the v4l2-ctrls.h header file,
sort the existing ones alphabetically.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-18 15:35:33 +02:00