Fancy Fang [Mon, 2 Jul 2018 09:37:37 +0000 (17:37 +0800)]
MLK-19017-3 gpu: imx: add system pm support for LCDIF
Implement the suspend()/resume() callbacks to support system
power management functions for LCDIF.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
7e00487012753cb370eab4ff5c05f76f7361297f)
(cherry picked from commit
ad367beb841a15dc99ef2773f7843d2e83d18edd)
Fancy Fang [Sun, 1 Jul 2018 06:22:50 +0000 (14:22 +0800)]
MLK-19017-2 gpu: imx: add DISPMIX power domain support for LCDIF
After the DISPMIX power domain enabled, all the related registers
will drop their values once runtime pm suspend called. So in the
pm runtime resume process, the LCDIF de-reset and some init jobs
need to be done, and these jobs are no longer necessary to be done
during probe stage anymore.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
f83aaaecaeb54d8b1231be2cb7175ce58682dae7)
(cherry picked from commit
aa6a8be1f5e5107d02e58e4091e666a2d8fbfcc6)
Fancy Fang [Mon, 16 Jul 2018 12:52:14 +0000 (20:52 +0800)]
MLK-18605-15 dt-bindings: display: panel: add 'video-mode' prop for rm67191
Add a new property 'video-mode' binding for panel rm67191
which is used to specify a video data transfer mode.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
9dba8643d7b9c73a2b20ef517c79bb799f5ade3d)
(cherry picked from commit
6a427c8e9c4ae06cb84a7d8c70b7a95cf92b4206)
Fancy Fang [Tue, 17 Jul 2018 00:26:53 +0000 (08:26 +0800)]
MLK-18605-14 drm/imx: lcdif: adjust 'max_height' for '1080x1920' mode
Change the maximum height limitation to 1920 to support
'1080x1920' resolution mode. It is a temporary work
around and will be improved later.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
44d0209e97e0c574af30dd7a7d7e059d4ddf996d)
(cherry picked from commit
884680d1decf63f5a9cb3ed4ef1b6452ad6d088a)
Fancy Fang [Thu, 5 Jul 2018 07:14:26 +0000 (15:14 +0800)]
MLK-18605-10 drm/bridge: sec-dsim: complete mipi panel support
This patch adds mipi panel enable/disable during the dsim
bridge enable/disable procedure and implements required
callbacks and helper functions for dsi panel peripheral
support.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
4ef0a4e4ba0faca91e5b556fd13483aafdb64519)
(cherry picked from commit
b43c58d9e04b331aa7468dd4ddf100ef40b766ab)
Fancy Fang [Mon, 16 Jul 2018 05:52:11 +0000 (13:52 +0800)]
MLK-18605-9 drm/bridge: sec-dsim: increase timeout values for BTA and LPRX
The current timeout values for 'BTA' and 'LPRX' in register
'DSIM_TIMEOUT' is not long enough for some dsi peripherals,
so increase them long enough for all current peripherals to
avoid timeout errors generation in some cases.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
8e2b86b317382635e74002a5b2a466804247e61a)
(cherry picked from commit
cf7e6fc89b939684cb5ee66ff501db540981e222)
Fancy Fang [Fri, 13 Jul 2018 10:32:35 +0000 (18:32 +0800)]
MLK-18605-8 drm/bridge: sec-dsim: add non-continuous clock support
Complete the non-continuous clock mode support.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
cd216df51f322434e45d12b6721637f1d8159fe4)
(cherry picked from commit
4b907a32838bf45768a1f687539a09ed96cf53a6)
Fancy Fang [Fri, 13 Jul 2018 02:39:21 +0000 (10:39 +0800)]
MLK-18605-7 drm/bridge: sec-dsim: correct a register macro misspelt
The macro 'CONFIG_NON_CONTINUOUS_CLOCK_LANE' has been misspelt
to 'CONFIG_NON_CONTINOUS_CLOCK_LANE'. So correct it.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
24a05825b7299fc2f60768468fafbbc9a33804ad)
(cherry picked from commit
3f20acbee9329e8a453879f06eaa34f336a43ea2)
Fancy Fang [Fri, 6 Jul 2018 09:43:22 +0000 (17:43 +0800)]
MLK-18605-6 drm/bridge: sec-dsim: add fifo pointers initialization
All the DSIM fifo pointers should be better to be put into the
initialized state before enabling DSIM to transfer commands or
data.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
1c1624e48c83623a538f4af862367e6b3cbf8d67)
(cherry picked from commit
1c9d8b1cce6e173be29141fcf868529204e2c9a8)
Fancy Fang [Fri, 6 Jul 2018 09:11:55 +0000 (17:11 +0800)]
MLK-18605-5 drm/bridge: sec-dsim: correct 'DSIM_FIFOCTRL' offset
According to the DSIM specification, the 'DSIM_FIFOCTRL'
register addr offset should be '0x4c' instead of '0x48'.
So correct it.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
31850816f3aea109aff6c4bbcb44221e7d74afb5)
(cherry picked from commit
0d6537496801653f4aad63fce9a30f94453c6c10)
Fancy Fang [Wed, 13 Jun 2018 11:45:58 +0000 (19:45 +0800)]
MLK-18605-4 drm/bridge: sec-dsim: refine data lanes stop state check
When the attached dsi device does not use all the data lanes
to transfer data, data lanes stop state check should only
check the lanes used precisely, since unused lanes state is
not guaranteed to be in some stable state.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
6787ee8505ab16bf7bba38c721da0bfa87e9de0e)
(cherry picked from commit
6281e4f4b6e0d4f8a0f714fe2112f70f2865c540)
Fancy Fang [Wed, 13 Jun 2018 11:01:39 +0000 (19:01 +0800)]
MLK-18605-3 drm/bridge: sec-dsim: refuse unknown dsi device attach
When a dsi device who is neither a bridge nor a panel requests
to be attached to the host, refuse this request directly.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
2e80acc8a611327fcc77d2e73515bc062cdc4233)
(cherry picked from commit
9ef87498c5406b44cd41b9592bdec9c948c962d2)
Fancy Fang [Wed, 13 Jun 2018 10:22:58 +0000 (18:22 +0800)]
MLK-18605-2 drm/bridge: sec-dsim: allow same panel can be re-attached
During the mode set procedure, some dsi client device may detach
itself first and then attach it again according to the target
display mode parameters. In this case, the dsi client device
should be allowed to be re-attached again. So this is also true
for panel device.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
f586625dd1a665c58b976405c7980b7414554481)
(cherry picked from commit
75f65aebfd661151811339d652e3704f5a7e3936)
Fancy Fang [Wed, 13 Jun 2018 09:32:58 +0000 (17:32 +0800)]
MLK-18605-1 drm/bridge: sec-dsim: add cleanup when detach dsi client
When the dsi device is detached, the dsi parameters saved when
the dsi device is attached should be cleaned to avoid to be
misused. And besides, add some sanity check along with this
cleanup.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
a02c30a0ed8acc4a136d2281431fa4b07d66b933)
(cherry picked from commit
0b78ed9b7c61d2b703c1065850bd5f25ea30482f)
Fancy Fang [Sat, 28 Jul 2018 11:03:57 +0000 (19:03 +0800)]
MLK-19081 drm/bridge: sec-dsim: correct args of 'drm_bridge_attach' call
Obviously, according to the drm_bridge_attach()'s definition,
the passing arguments of its function call should be corrected
here.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
e04e4d286abf204b5db058018112026ad5d08271)
Fancy Fang [Mon, 11 Jun 2018 07:57:48 +0000 (15:57 +0800)]
MLK-18560 drm/imx: lcdif: refine bus format sanity check for plane
Add an function to get the LCDIF controller supported bus
formats according to the pixel format bpp. And change the
bus format sanity check in the plane's atomic check to see
if the bus format required by the peripheral attached to
LCDIF can be supported by LCDIF.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
f1d0c89ec48e6b76ddde9c55744ebb341f74ab3a)
Fancy Fang [Thu, 7 Jun 2018 06:09:34 +0000 (14:09 +0800)]
MLK-18535-12 dt-bindings: display: imx: add eLCDIF device node
Add the device-tree bindings for the display node eLCDIF
on i.MX platforms.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
b5bbc0b7aac35101edfa9bfe6079d97a2c847175)
Fancy Fang [Wed, 6 Jun 2018 16:10:12 +0000 (00:10 +0800)]
MLK-18535-10 drm/imx: lcdif: limit the maximum resolution to '1920x1080'
For now, the higher resolution than '1920x1080' is not supported
yet. So limit the 'max_width' and 'max_height' of mode_config
to be 1920 and 1080.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
0ad9839e59978e2c425f6d7ffa9b4561598625b5)
Fancy Fang [Sun, 3 Jun 2018 16:04:13 +0000 (00:04 +0800)]
MLK-18535-9 ARM64: defconfig: enable 'IMX_SEC_DSIM' config
Enable the 'IMX_SEC_DSIM' config by default in ARM64
defconfig.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
3a1bb280c4b5338dfb9c8a8b24929e02b7803aee)
Fancy Fang [Wed, 6 Jun 2018 15:46:37 +0000 (23:46 +0800)]
MLK-18535-8 drm/imx: sec_mipi_dsim-imx: add DSIM host driver
The Samsung DSIM host driver mainly focuses on the config
related with soc platforms. And the controller itself config
has been moved to the sec-dsim bridge driver.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
941ef8c5fc870b72d18c1ec5abc69c5523647cba)
Fancy Fang [Wed, 6 Jun 2018 15:32:56 +0000 (23:32 +0800)]
MLK-18535-7 drm/bridge: sec-dsim: add bridge driver support
This is the abstracted bridge driver for Samsung MIPI DSIM
controller. This driver only foucses on the DSIM controller
itself configurations and never care about any config about
the platforms. So it can be shared by different platforms
without any modifications.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
beb9d163c755fe7ae960b79d85c0c1436a8dc057)
Fancy Fang [Wed, 6 Jun 2018 15:20:43 +0000 (23:20 +0800)]
MLK-18535-6 drm/imx: core: add LCDIF support
Allows the LCDIF to be one of the supported client
components. And set the 'legacyfb_depth' of LCDIF
to be 32.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
dae914b351853add6d506925cc0c9742ee698bc4)
Fancy Fang [Wed, 6 Jun 2018 14:52:35 +0000 (22:52 +0800)]
MLK-18535-5 drm/imx: add LCDIF DRM/KMS driver
This is a new DRM/KMS driver for LCDIF which conforms
to the IMX DRM Core framework. It provides support for
CRTCs, Planes and mode config of KMS.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
a104e928da7281a3089ff31afb2df979f35716b8)
Fancy Fang [Sun, 27 May 2018 08:40:13 +0000 (16:40 +0800)]
MLK-18535-4 ARM64: defconfig: enable 'IMX_LCDIF_CORE' config
Enable the 'IMX_LCDIF_CORE' config by default in ARM64
defconfig.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
09f1d5639676712f813cec99254abe29175ff9b3)
Fancy Fang [Wed, 6 Jun 2018 14:26:28 +0000 (22:26 +0800)]
MLK-18535-3 gpu: imx: add LCDIF core driver
The LCDIF core driver is responsible to provide controller
registers configuration and create the platform devices for
the child port nodes. And the platform devices later will
attach to the corresponding DRM/KMS drivers via name match.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
ca168846dcfe6d498d33f4a977b21b25ca5c6c41)
Guoniu.Zhou [Wed, 27 Mar 2019 06:33:59 +0000 (14:33 +0800)]
MLK-21257-5: arm64: dts: fix warnning when complie dts
Because ov5640 device node has been in fsl-imx8qxp-mek-ov5640-rpmsg.dts,
so there is no need to another one.
In 4.19 kernel dts, local endpoint need to match one remote endpoint,
not for two or more, so delete redundant node.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Wed, 27 Mar 2019 03:15:50 +0000 (11:15 +0800)]
MLK-21257-4: arm64: dts: change compatible string for i2c node of mipi csi
Because "fsl,imx8qm-lpi2c" was remove from of_device_id structure in
i2c-imx-lpi2c.c driver, so add "fsl,imx7ulp-lpi2c" in compatible string
of i2c node.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Wed, 27 Mar 2019 03:10:51 +0000 (11:10 +0800)]
MLK-21257-3: media: isi: fix some conflicts when do upgrade
Fix some conflicts when do kernel 4.19 upgrade
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Wed, 13 Feb 2019 10:50:39 +0000 (18:50 +0800)]
MLK-20923: ISI: improve ISI memory to memory performance
Refer to ISI validataion code, there is no need to enable ISI
mem2mem read done interrupt and driver can handle buffers in
frame received interrupt service
Remove 50ms delay when enable ISI AXI read, it will improve
performance obviously
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
bdabe035cd5c57d713f824e61f120213ed9357ba)
(cherry picked from commit
7dd4c6affaaceefd80e6b4a033c21f6b26303902)
Guoniu.Zhou [Mon, 17 Dec 2018 02:16:55 +0000 (10:16 +0800)]
MLK-20595-2: camera: check camera's running state before suspend
Check camera's running state before suspend for imx8qm/qxp
and don't support suspend when camera's running
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Wed, 17 Oct 2018 02:16:08 +0000 (10:16 +0800)]
MLK-19957-1: ISI: clean isi status before enable interrupt
Because ISI can't restore to default state after software
reset, the status value of exit will be maintained. If not
cleared, ISI will triggle fake interrupt after enableing irq,
but there is not ready for data.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
932af3df1745f5afb0b9433d3355b2e24b177f4e)
Guoniu.Zhou [Fri, 12 Oct 2018 02:55:41 +0000 (10:55 +0800)]
MLK-19901: ISI: manually clean isi status register
When QM run two linux and divide ISI resource into two
parts, channel 0-3 for one linux and channel 4-7 for the
other. If dom0 destroy domU which camera is running, then
restart domU. ISI will trigger interrupt immediately after
register irq handler when driver probe. The reason for this
is that status register of ISI isn't cleared. ISI have no
ablility to reset its register to defautl value expcept power
off all resource of ISI, but it can't be done in two os. So
manually clean status before registering irq when driver probe.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
b84601aaef15870c80f684b1881b22e9dd2ba9a3)
Guoniu.Zhou [Tue, 4 Sep 2018 10:05:38 +0000 (18:05 +0800)]
MLK-19514-2: ISI: use ping-pong buffer of ISI
1. Use ping-pong buffer of isi.
2. Add multi-plane support for m2m out queue. When
V4L2 m2m device support multi-plane, it should be
applied for both input and output, so add it.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Mon, 27 Aug 2018 10:28:23 +0000 (18:28 +0800)]
MLK-19343: ISI: add memory to memory support for qm and qxp
Add memory to memory support for qm and qxp. Because only
ISI channel0 can support memory to memory feature so this
feature only support one channel. User can use channel 0
as other function when it isn't used for m2m.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Reviewed-by: Sandor.yu <sandor.yu@nxp.com>
Guoniu.Zhou [Tue, 31 Jul 2018 09:41:20 +0000 (17:41 +0800)]
MLK-19111: ISI: fix module installation fail issue
If build ISI driver as module and insmod it after system
boot up, it will fail. Because lack of MODULE_LICENSE("GPL")
,insmod isi driver will print many unknown symbol messages
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Reviewed-by: Robby.Cai <robby.cai@nxp.com>
Guoniu.Zhou [Tue, 31 Jul 2018 07:58:41 +0000 (15:58 +0800)]
MLK-19108: ISI: fix isi hang issue when open it many times
When one ISI channel is receiving data, if an other process
just open it at the same time and then close, it will lead
to this channel hang. The reason is soft reset in release
callback, so it make the channel stop work. Add an counter
for open isi channel and really soft reset the channel when
the counter equal to zero.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Reviewed-by: Robby.Cai <robby.cai@nxp.com>
Guoniu.Zhou [Thu, 28 Jun 2018 01:47:54 +0000 (09:47 +0800)]
MLK-18517-1: ISI: fix system reboot stress test from nfs fail
1. System will dump painc message and hang when do system
reboot stress test. It caused by ISI HW reset function. When
user open the video device, it will get the device and driver
will turn on ISI power domain, but after that, ISI HW reset
will first turn off and then turn on it's power. During this
time, the process which open ISI channel 0 maybe sleep and
the other process which open other ISI channel will active but
the other channel power domain depend on channel 0. It leads to
system panic. So change msleep to udelay and move HW reset to
other place.
2. Refine ISI system and runtime suspend/resume.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Tue, 12 Jun 2018 08:56:14 +0000 (16:56 +0800)]
MLK-18482: ISI: fix isi resume fail issue
Driver enable clock will fail in isi system power resume
callback because isi power domain is power off after system
power suspend so driver need to get device before disable
clock in system power suspend/resume callback and then put
device after disable clock.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
668fdea95ff9b4588f02a5c4285d56b90e05ccb4)
Guoniu.Zhou [Mon, 5 Feb 2018 08:26:38 +0000 (16:26 +0800)]
MLK-17230-8: camera: add CI_PI in camera device framework
Add CI_PI and ov5640 camera sensor support in camera device
framework. The data flow is "ov5640->ci_pi->isi_ch0". Disable
the other channels of ISI.
Reviewed-by: Sandor.Yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
37bc5d225e8a3eeb21fef5d94335d1edb2036988)
Guoniu.Zhou [Fri, 8 Dec 2017 11:32:34 +0000 (19:32 +0800)]
MLK-16549-2: ISI: fix suspend/resume error issue
Because ISI runtime suspend has disable clock before system
suspend. If driver does not know that and disable clock again
in system suspend callback. It will lead to isi clk count mis-
match.
Reviewed-by: Sandor.Yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Wed, 15 Nov 2017 12:13:30 +0000 (20:13 +0800)]
MLK-16823-2: mipi_csi: Add runtime suspend/resume
Add runtime suspend/resume support for ISI. For saving
power, the ISI turn off it's power domain after probe.
Reviewed-by: Sandor Yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
d0cf6f32660c5b03fda5083fee578579f22c4d3b)
Peng Fan [Wed, 29 Nov 2017 03:48:04 +0000 (11:48 +0800)]
MLK-17019 Correct Copyright
Correct Copyright
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Guoniu.Zhou [Fri, 10 Nov 2017 03:09:21 +0000 (11:09 +0800)]
MLK-16695-3: mipi_csi: Change printk to dev_dbg
Messages in ISI irq handler are for debugging, so
change printk to dev_dbg for this purpose.
The width and height of image information need output
in debug process.
Reviewed-by: Sandor Yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
e254c8408f69eca9b668af58d911f27a4fefc121)
Guoniu.Zhou [Fri, 10 Nov 2017 03:01:46 +0000 (11:01 +0800)]
MLK-16695-2: mipi_csi: Add pm suspend and resume support
Add power manager suspend and resume support for ISI
Reviewed-by: Sandor Yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Sandor Yu [Fri, 28 Jul 2017 03:08:27 +0000 (11:08 +0800)]
MLK-16062-2: i.MX8 imaging: Add debug log to imaging SS driver
Add debug log to imaging SS drivers.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Sandor Yu [Tue, 20 Jun 2017 07:37:16 +0000 (15:37 +0800)]
MLK-15124-04: image ss: Add mx8 image subsystem driver
Add mxc media device driver.
Add mx8 isi device driver.
Add mx8 mipi csi device driver.
Add max9286 sensor driver.
mxc isi driver support CSC and scaling function.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Guoniu.Zhou [Fri, 9 Nov 2018 10:48:13 +0000 (18:48 +0800)]
MLK-20326-2: ISI: enable horizonal and vertical flip for mem2mem
Eanble horizonal and vertical flip for memory to memory function
of ISI
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Tue, 4 Sep 2018 10:05:38 +0000 (18:05 +0800)]
MLK-19514-2: ISI: use ping-pong buffer of ISI
1. Use ping-pong buffer of isi.
2. Add multi-plane support for m2m out queue. When
V4L2 m2m device support multi-plane, it should be
applied for both input and output, so add it.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Mon, 27 Aug 2018 10:28:23 +0000 (18:28 +0800)]
MLK-19343: ISI: add memory to memory support for qm and qxp
Add memory to memory support for qm and qxp. Because only
ISI channel0 can support memory to memory feature so this
feature only support one channel. User can use channel 0
as other function when it isn't used for m2m.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Reviewed-by: Sandor.yu <sandor.yu@nxp.com>
Guoniu.Zhou [Thu, 28 Jun 2018 01:47:54 +0000 (09:47 +0800)]
MLK-18517-1: ISI: fix system reboot stress test from nfs fail
1. System will dump painc message and hang when do system
reboot stress test. It caused by ISI HW reset function. When
user open the video device, it will get the device and driver
will turn on ISI power domain, but after that, ISI HW reset
will first turn off and then turn on it's power. During this
time, the process which open ISI channel 0 maybe sleep and
the other process which open other ISI channel will active but
the other channel power domain depend on channel 0. It leads to
system panic. So change msleep to udelay and move HW reset to
other place.
2. Refine ISI system and runtime suspend/resume.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Wed, 15 Nov 2017 12:13:30 +0000 (20:13 +0800)]
MLK-16823-2: mipi_csi: Add runtime suspend/resume
Add runtime suspend/resume support for ISI. For saving
power, the ISI turn off it's power domain after probe.
Reviewed-by: Sandor Yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
d0cf6f32660c5b03fda5083fee578579f22c4d3b)
Guoniu.Zhou [Fri, 10 Nov 2017 03:01:46 +0000 (11:01 +0800)]
MLK-16695-2: mipi_csi: Add pm suspend and resume support
Add power manager suspend and resume support for ISI
Reviewed-by: Sandor Yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Sandor Yu [Tue, 20 Jun 2017 07:37:16 +0000 (15:37 +0800)]
MLK-15124-04: image ss: Add mx8 image subsystem driver
Add mxc media device driver.
Add mx8 isi device driver.
Add mx8 mipi csi device driver.
Add max9286 sensor driver.
mxc isi driver support CSC and scaling function.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Guoniu.Zhou [Wed, 27 Mar 2019 02:43:27 +0000 (10:43 +0800)]
MLK-21257-2: media: mipi_csi_yav: fix build error for imx8mq mipi csi driver
In the 4.19 kernel, v4l2 async framework move async subdev notifier operations
to a separate structure and simplify v4l2_async_subdev structure. So adapt to
the change in our driver.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Mirela Rabulea [Wed, 12 Sep 2018 08:50:54 +0000 (11:50 +0300)]
MLK-19362: media: csi: Fix "Hresponse" and "Rx fifo overflow" camera errors
When the register setting for fifo_send_level is set to high, some residual
data of a frame which cannot fill up to the send_level, will be sent with
the next frame data. In this case, for CSI receive dma, sometimes,
the vertical blanking is too short to finish the storage of the previous
frame before the next frame start, depending on the system bandwidth.
Tested on imx8mq-evk rev B4 and B3, with OV5640 camera.
This patch was proposed by Tom Zheng <haidong.zheng@nxp.com>
Signed-off-by: Mirela Rabulea <mirela.rabulea@nxp.com>
Reviewed-by: Robby Cai <robby.cai@nxp.com>
Robby Cai [Thu, 7 Dec 2017 07:05:42 +0000 (15:05 +0800)]
MLK-17116-2 media: mipi_csi: Adjust hs_settle and send_level for low resolution
Change the hs_settle and fifo_send_level setting for 640x480 and 720x480 input
resolution.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Reviewed-by: Sandor Yu <sandor.yu@nxp.com>
(cherry picked from commit
3c081af366e250ff011319d80c5706ae7b8e38ca)
Robby Cai [Fri, 24 Nov 2017 10:52:54 +0000 (18:52 +0800)]
MLK-16977-2 media: v4l_cap: don't support suspend when camera is running
Don't support suspend/resume by checking if camera is running.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Robby Cai [Fri, 24 Nov 2017 10:39:13 +0000 (18:39 +0800)]
MLK-16977-1 media: v4l_cap: implement S_FMT ioctl
gsteamer uses S_FMT ioctl to set the resolution instead of using
S_PARM ioctl. The S_PARM ioctl depends on the capture mode which is
not in the common way.
This patch uses a common method to set the picture resulotion.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Robby Cai [Wed, 22 Nov 2017 10:58:59 +0000 (18:58 +0800)]
MLK-16943 mipi-csi: Add run time pm support
Add run time PM support for MIPI CSI (tested on iMX8MQ)
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Reviewed-by: Sandor Yu <Sandor.yu@nxp.com>
Robby Cai [Tue, 21 Nov 2017 20:59:06 +0000 (04:59 +0800)]
MLK-16919-5 media: v4l2: add mipi csi driver on iMX8MQ
Add a new version (yet another version) driver for MIPI CSI2.
The reason we use a separate version is that PHY setting is quit different,
and the existing MIPI CSI2 driver uses new Media Framework, while the camera
and CSI driver not yet. After convert all drivers to new Media Framework,
consider combine these two versions.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Reviewed-by: Sandor Yu <Sandor.yu@nxp.com>
Guoniu.Zhou [Wed, 27 Mar 2019 02:31:25 +0000 (10:31 +0800)]
MLK-21257-1: media: fix build error for QM/QXP camera driver
In the 4.19 kernel, v4l2 async framework move async subdev notifier operations
to a separate structure and simplify v4l2_async_subdev structure. So adapt to
the change in our driver.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Sandor Yu [Tue, 20 Jun 2017 07:37:16 +0000 (15:37 +0800)]
MLK-15124-04: image ss: Add mx8 image subsystem driver
Add mxc media device driver.
Add mx8 isi device driver.
Add mx8 mipi csi device driver.
Add max9286 sensor driver.
mxc isi driver support CSC and scaling function.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Guoniu.Zhou [Fri, 20 Apr 2018 08:23:09 +0000 (16:23 +0800)]
MLK-18098: camera: add MIPI and PARALLEL CSI support in one dtb
1. Divide ov5640_v3.c into two parts, one for parallel csi driver
and the other for mipi csi driver
2. Add parallel and mipi support in one dtb file. User can select
one of them without changing the dtb file
Reviewed-by: Sandor.yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Mon, 5 Feb 2018 07:58:39 +0000 (15:58 +0800)]
MLK-17230-6: sensor: add driver for ov5640 camera sensor
Add version3.0 driver for ov5640 camera sensor. It works on DVP
mode
Reviewed-by: Sandor.Yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
64d7dd18ac3c768480df8390ab02a35142a220cd)
Guoniu.Zhou [Mon, 5 Feb 2018 07:43:23 +0000 (15:43 +0800)]
MLK-17230-5: CI_PI: enable CI_PI SS
Add driver for CI_PI controller.
Reviewed-by: Sandor.Yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
980ac5f965bd8e94cce8a8c3fa78b1062dbd1727)
Sandor Yu [Tue, 20 Jun 2017 07:37:16 +0000 (15:37 +0800)]
MLK-15124-04: image ss: Add mx8 image subsystem driver
Add mxc media device driver.
Add mx8 isi device driver.
Add mx8 mipi csi device driver.
Add max9286 sensor driver.
mxc isi driver support CSC and scaling function.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Guoniu.Zhou [Mon, 27 Aug 2018 10:28:23 +0000 (18:28 +0800)]
MLK-19343: ISI: add memory to memory support for qm and qxp
Add memory to memory support for qm and qxp. Because only
ISI channel0 can support memory to memory feature so this
feature only support one channel. User can use channel 0
as other function when it isn't used for m2m.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Reviewed-by: Sandor.yu <sandor.yu@nxp.com>
Guoniu.Zhou [Fri, 20 Apr 2018 08:23:09 +0000 (16:23 +0800)]
MLK-18098: camera: add MIPI and PARALLEL CSI support in one dtb
1. Divide ov5640_v3.c into two parts, one for parallel csi driver
and the other for mipi csi driver
2. Add parallel and mipi support in one dtb file. User can select
one of them without changing the dtb file
Reviewed-by: Sandor.yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Mon, 5 Feb 2018 07:58:39 +0000 (15:58 +0800)]
MLK-17230-6: sensor: add driver for ov5640 camera sensor
Add version3.0 driver for ov5640 camera sensor. It works on DVP
mode
Reviewed-by: Sandor.Yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
64d7dd18ac3c768480df8390ab02a35142a220cd)
Guoniu.Zhou [Mon, 5 Feb 2018 07:43:23 +0000 (15:43 +0800)]
MLK-17230-5: CI_PI: enable CI_PI SS
Add driver for CI_PI controller.
Reviewed-by: Sandor.Yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
980ac5f965bd8e94cce8a8c3fa78b1062dbd1727)
Robby Cai [Tue, 21 Nov 2017 20:59:06 +0000 (04:59 +0800)]
MLK-16919-5 media: v4l2: add mipi csi driver on iMX8MQ
Add a new version (yet another version) driver for MIPI CSI2.
The reason we use a separate version is that PHY setting is quit different,
and the existing MIPI CSI2 driver uses new Media Framework, while the camera
and CSI driver not yet. After convert all drivers to new Media Framework,
consider combine these two versions.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Reviewed-by: Sandor Yu <Sandor.yu@nxp.com>
Sandor Yu [Tue, 20 Jun 2017 07:37:16 +0000 (15:37 +0800)]
MLK-15124-04: image ss: Add mx8 image subsystem driver
Add mxc media device driver.
Add mx8 isi device driver.
Add mx8 mipi csi device driver.
Add max9286 sensor driver.
mxc isi driver support CSC and scaling function.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Sandor Yu [Tue, 20 Jun 2017 07:37:16 +0000 (15:37 +0800)]
MLK-15124-04: image ss: Add mx8 image subsystem driver
Add mxc media device driver.
Add mx8 isi device driver.
Add mx8 mipi csi device driver.
Add max9286 sensor driver.
mxc isi driver support CSC and scaling function.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Sandor Yu [Tue, 20 Jun 2017 07:45:25 +0000 (15:45 +0800)]
MLK-15124-06: defconfig: Add mx8 image subsystem
Add mx8 image subsystem and v4l2 device.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Guoniu.Zhou [Tue, 19 Mar 2019 09:29:01 +0000 (17:29 +0800)]
MLK-20694: media: m2m: add control for querying minimum buffer for capture and output
Add V4L2_CID_MIN_BUFFERS_FOR_CAPTURE and V4L2_CID_MIN_BUFFERS_FOR_OUTPUT control
ID for querying minimum buffer for capture and output
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Thu, 14 Feb 2019 02:48:03 +0000 (10:48 +0800)]
MLK-20924-2: ISI: add checking for the number of requested buffer
For the number of requested source buffer, driver need one at least.
For the number of requested destination buffer, driver need three at least.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
c3d33d6ad971b2e03c034e14696d64549245f918)
(cherry picked from commit
36e36d3c529a16b7b00faddf967bfbf828309a56)
Guoniu.Zhou [Thu, 14 Feb 2019 02:23:10 +0000 (10:23 +0800)]
MLK-20924-1: ISI: fix potential dead lock issue
Fix potential dead lock issue
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
322beb5215ea921dd30c0974cd17465de306927b)
(cherry picked from commit
aa04582b28aabcd6ec8e5dd5ad0a2310f2111ff0)
Guoniu.Zhou [Wed, 13 Feb 2019 10:50:39 +0000 (18:50 +0800)]
MLK-20923: ISI: improve ISI memory to memory performance
Refer to ISI validataion code, there is no need to enable ISI
mem2mem read done interrupt and driver can handle buffers in
frame received interrupt service
Remove 50ms delay when enable ISI AXI read, it will improve
performance obviously
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
bdabe035cd5c57d713f824e61f120213ed9357ba)
(cherry picked from commit
7dd4c6affaaceefd80e6b4a033c21f6b26303902)
Guoniu.Zhou [Mon, 11 Feb 2019 10:05:54 +0000 (18:05 +0800)]
MLK-20888: m2m: add checking for userspace input parameters
Checking parameters from userspace befor applying for different format
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
47ff54238f138be015756a45afb0af58b52e5a02)
(cherry picked from commit
5a52bef34e084943ac5ca8c4c27ca4e0c97a4263)
Guoniu.Zhou [Mon, 14 Jan 2019 06:23:03 +0000 (14:23 +0800)]
MLK-20724: m2m: add RGBA to exend V4L2 standard format for android usage
Android has RGBA format output but V4L2 framework do not have this format
.In order to support this in our mem2mem driver, we need to extend V4L2
format.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Thu, 20 Dec 2018 02:48:17 +0000 (10:48 +0800)]
MLK-20192-4: m2m: Coverity: remove the dead code
Because the address of an object is never null and the if
statement will never true so remove the dead code
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Fri, 9 Nov 2018 10:57:32 +0000 (18:57 +0800)]
MLK-20326-4: ISI: enable alpha insertion for mem2mem
Enable global alpha insertion for memory to memory function
of ISI
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Fri, 9 Nov 2018 10:48:13 +0000 (18:48 +0800)]
MLK-20326-2: ISI: enable horizonal and vertical flip for mem2mem
Eanble horizonal and vertical flip for memory to memory function
of ISI
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Thu, 8 Nov 2018 11:25:44 +0000 (19:25 +0800)]
MLK-19291: ISI: correct color mapping between V4L2 and ISI
Correct color mapping between V4L2 and ISI
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Thu, 25 Oct 2018 03:14:52 +0000 (11:14 +0800)]
MLK-20046-2: ISI: add YUV444M format support
add YUV444M format support
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
e424d16926d0320b31850bdd293e77c164a80661)
Guoniu.Zhou [Mon, 22 Oct 2018 07:48:00 +0000 (15:48 +0800)]
MMFMWK-8296: ISI: return error code when user try to do upscale
Return error code when user try to do upscale since isi don't support.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
59949e29dcd996c50cae43bc5ff3f89907761c1b)
Guoniu.Zhou [Mon, 22 Oct 2018 07:19:27 +0000 (15:19 +0800)]
MMFMWK-8297: ISI: return error when ISI chan0 is busy
When ISI channel0 is used to recevice camera data, it can
not be used to mem2mem. So return -EBUSY error code when
user try to use them at the same time.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
c6d5bf866819deaaf4900ae47d575c5a36d30a66)
Guoniu.Zhou [Fri, 12 Oct 2018 10:42:18 +0000 (18:42 +0800)]
MLK-19915: m2m: correct V4L2_PIX_FMT_RGB32 to V4L2_PIX_FMT_XRGB32
Because V4L2_PIX_FMT_RGB32 is deprecated and must not
be used by new drivers. V4L2_PIX_FMT_XRGB32 is used to
replace it.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
e9e5c58dbea63bad8be43c924d35d499499b1804)
Guoniu.Zhou [Thu, 13 Sep 2018 10:23:08 +0000 (18:23 +0800)]
MLK-19597: ISI: fix m2m hang issue after receiving 254 frames
In order to use ISI ping-pong buffer, driver add another list
for V4L2 m2m cap_q queue and add new list member to it from
cap_q default list without decreasing the related counter, so
it leads to overflow when run 254 times. So correct it.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Tue, 4 Sep 2018 10:05:38 +0000 (18:05 +0800)]
MLK-19514-2: ISI: use ping-pong buffer of ISI
1. Use ping-pong buffer of isi.
2. Add multi-plane support for m2m out queue. When
V4L2 m2m device support multi-plane, it should be
applied for both input and output, so add it.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Mon, 3 Sep 2018 07:20:10 +0000 (15:20 +0800)]
MLK-19514-1: ISI: correct capture and output meaning
According to V4L2 doc, cap_q_ctx is for "output to memory"
queue and out_q_ctx is for "input from memory", so capature
should represent for output of ISI and output should represent
for ISI's input. But I reversed their relationship, so correct
it.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Mon, 27 Aug 2018 10:28:23 +0000 (18:28 +0800)]
MLK-19343: ISI: add memory to memory support for qm and qxp
Add memory to memory support for qm and qxp. Because only
ISI channel0 can support memory to memory feature so this
feature only support one channel. User can use channel 0
as other function when it isn't used for m2m.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Reviewed-by: Sandor.yu <sandor.yu@nxp.com>
Guoniu.Zhou [Fri, 14 Dec 2018 10:08:25 +0000 (18:08 +0800)]
MLK-20595-1: camera: fix camera hang issue after resume
The reset pin of ov5640 will power down when system suspend and
it will lead to reset ov5640, so driver need to reinitialize the
sensor before streaming
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Mon, 19 Nov 2018 07:14:05 +0000 (15:14 +0800)]
MLK-20404: sensor: fix potential memory leaks for ov5640
Driver does not free memory when it's removed or encounter
an error in probe. So fix potential memory leaks.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Tue, 13 Nov 2018 03:01:14 +0000 (11:01 +0800)]
MLK-20335: ov5640: add QVGA resolution support for mipi ov5640
Add QVGA resolution support for mipi ov5640
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Tue, 30 Oct 2018 06:58:48 +0000 (14:58 +0800)]
MLK-20123-1: camera: add automatic selection mode for mipi ov5640
There is two methods to select different mode for camera sensor, one
is setting mode by VIDIOC_S_PARM ioctl and the other is automatic
selection through resolution. If resolution match one of camera sensor
supported, driver will select the corresponding mode. If not, driver
will select the max resolution supported by sensor and use ISI to
resize to the target resolution.
This patch is for mipi interface of ov5640 sensor
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
4c560890906f7df33e68a65372f60778cb1406b7)
Guoniu.Zhou [Wed, 25 Jul 2018 03:20:04 +0000 (11:20 +0800)]
MLK-19007-2: camera: add "NTSC, 720P, QSXGA" for mipi ov5640
1. Use ISI channel 2 instead of 1 for mipi ov5640 because if
image line resolution is more than 2k, isi line buffer need
to chain to recevice line data
2. Add 15fps QSXGA, 30fps NTSC and 720P support for mipi ov5640
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Reviewed-by: Robby.Cai <robby.cai@nxp.com>
Guoniu.Zhou [Wed, 25 Apr 2018 09:28:32 +0000 (17:28 +0800)]
MLK-18130: camera: add two ov5640 sensor support for QM
Add two ov5640 sensors support for QM since it has two
MIPI CSI controller.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Fri, 20 Apr 2018 08:23:09 +0000 (16:23 +0800)]
MLK-18098: camera: add MIPI and PARALLEL CSI support in one dtb
1. Divide ov5640_v3.c into two parts, one for parallel csi driver
and the other for mipi csi driver
2. Add parallel and mipi support in one dtb file. User can select
one of them without changing the dtb file
Reviewed-by: Sandor.yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Guoniu.Zhou [Fri, 14 Dec 2018 10:08:25 +0000 (18:08 +0800)]
MLK-20595-1: camera: fix camera hang issue after resume
The reset pin of ov5640 will power down when system suspend and
it will lead to reset ov5640, so driver need to reinitialize the
sensor before streaming
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>