Commit Graph

1497 Commits

Author SHA1 Message Date
Camera Software Integration
7ac644bba3 Merge "msm: camera: isp: Update substate prior to notifying CRM" into camera-kernel.lnx.5.0 2021-04-28 21:23:04 -07:00
Camera Software Integration
92c871914e Merge "msm: camera: isp: Move constraint error info to header" into camera-kernel.lnx.5.0 2021-04-28 21:22:59 -07:00
Camera Software Integration
5341e5810f Merge "msm: camera: utils: Modify pointer check for clk debugfs" into camera-kernel.lnx.5.0 2021-04-28 21:22:55 -07:00
Camera Software Integration
18e3dd6a8e Merge "msm: camera: reqmgr: Propagate hw failures to user" into camera-kernel.lnx.5.0 2021-04-28 21:22:50 -07:00
Camera Software Integration
639f9c82b4 Merge "msm: camera: reqmgr: Remove debug flags when creating timer slab" into camera-kernel.lnx.5.0 2021-04-28 21:22:46 -07:00
Camera Software Integration
625981cd2e Merge "msm: camera: common: Fix NULL pointer dereference" into camera-kernel.lnx.5.0 2021-04-28 21:20:01 -07:00
Camera Software Integration
1ef64946ef Merge "msm: camera: isp: Remove CPAS version check from IFE HW manager" into camera-kernel.lnx.5.0 2021-04-28 21:19:56 -07:00
Camera Software Integration
5cf3a57890 Merge "msm: camera: reqmgr: add trace log for separating multi camera" into camera-kernel.lnx.5.0 2021-04-28 21:19:52 -07:00
Camera Software Integration
f857a1140c Merge "msm: camera: isp: Reapply bubble request in RDI path" into camera-kernel.lnx.5.0 2021-04-28 21:19:47 -07:00
Camera Software Integration
6d42813b77 Merge "msm: camera: isp: Add format and alignment for type 3 PD" into camera-kernel.lnx.5.0 2021-04-28 19:35:21 -07:00
Mukund Madhusudan Atre
a5bc29d875 msm: camera: isp: Add format and alignment for type 3 PD
Add applicable format and alignment properties for Sparse PD client.

CRs-Fixed: 2841729
Change-Id: I5f3c5c195793ce4758b1393653b14fb49ac039c6
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-04-22 12:51:54 -07:00
Anand Ravi
bd2bdb729a msm: camera: isp: Remove crop values configuration from CSID
CSID will no longer write to crop registers for all paths. UMD will
configure those registers in init packet. Crop enable logic is retained.

CRs-Fixed: 2929029
Change-Id: If6888d9094a6af3306c603d737b10c32918ab787
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-04-21 22:05:32 -07:00
Karthik Anantha Ram
671fbda8c2 msm: camera: isp: Update substate prior to notifying CRM
When a bubble is detected ISP notifies CRM either for recovery or
provides a trigger to apply next req. Due to scheduling issues,
it's possible that CRM triggers an apply prior to ISP substate update
leading to apply failures. This could prove fatal in case of
FS/sHDR use-cases. This change updates the substate prior to
notifying CRM.

CRs-Fixed: 2841729
Change-Id: I5ccc2b91f347ec29a5dcf6aafe71c063572a7ff7
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-04-21 18:29:37 -07:00
Haritha Chintalapati
8b6740991b Merge "msm: camera: icp: Check for negative BW path index" into camera-kernel.lnx.5.0 2021-04-21 17:24:13 -07:00
Haritha Chintalapati
5d691aee7f Merge "msm: camera: common: Add a check for 0 reg-val pairs in cdm command" into camera-kernel.lnx.5.0 2021-04-21 17:24:01 -07:00
Haritha Chintalapati
770082c50d Merge "msm: camera: isp: Modify state of WM node only on successful acquire" into camera-kernel.lnx.5.0 2021-04-21 17:23:33 -07:00
Haritha Chintalapati
4a2fa25c90 Merge "msm: camera: sensor: Improve Logging" into camera-kernel.lnx.5.0 2021-04-21 17:23:14 -07:00
Haritha Chintalapati
b3e5929a41 Merge "msm: camera: isp: Remove redundant code" into camera-kernel.lnx.5.0 2021-04-21 17:22:58 -07:00
Haritha Chintalapati
b74479763b Merge "msm: camera: csiphy: Add support for delay in IRQ confiq" into camera-kernel.lnx.5.0 2021-04-21 17:22:41 -07:00
Haritha Chintalapati
fc23ac64c4 Merge "msm: camera: isp: Clear previous dual IFE sync config on release" into camera-kernel.lnx.5.0 2021-04-21 17:22:22 -07:00
Haritha Chintalapati
03f6eb7c28 Merge "msm: camera: isp: Send correct cphy id to cphy driver" into camera-kernel.lnx.5.0 2021-04-21 17:21:59 -07:00
Jigar Agrawal
b5c4f91b83 msm: camera: common: Add a check for 0 reg-val pairs in cdm command
Add a check for reg-val count=0 in reg_random command. Count=0 in
reg_random cdm command will throw an invalid command HW error.

CRs-Fixed: 2916477
Change-Id: Idb8654c3752963cf5a52147d350e291208b917d0
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-04-20 12:17:50 -07:00
Karthik Anantha Ram
df415f79ad msm: camera: icp: Check for negative BW path index
Validate per path BW index to ensure it's not negative.
During IDLE time for a given IPE/BPS stream the BW structure is
memset to 0x0 forcing the index and vote to 0. On the next instance
when BW is to removed for the given stream from consolidated
BW value the computed index turns out to be less than zero leading
to an invalid array access. This change validates the index
prior to access.

CRs-Fixed: 2841729
Change-Id: I944f07015538323578b9728053a590686ee20d1a
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-04-20 08:57:17 -07:00
Jigar Agrawal
76857940be msm: camera: reqmgr: Propagate hw failures to user
Propagate error code to user in order to let the
user know more about the failure.

CRs-Fixed: 2860306
Change-Id: Icf030aa9df32eac97371059c2d282cfb53257401
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-04-19 19:07:15 -07:00
Mukund Madhusudan Atre
30d8880fda msm: camera: isp: Move constraint error info to header
Move constraint error bitmasks to header for vfe and sfe.
Add WM name to sfe header.

CRs-Fixed: 2841729
Change-Id: Ia5d18f1a348fabe9679acc3c50983392d8864613
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-04-19 11:46:05 -07:00
Jigar Agrawal
5992dd4885 msm: camera: common: Fix NULL pointer dereference
Set the debugfs root entry pointer to null after
recursive remove at unbinding to prevent null pointer
dereference by kernel followed by kernel panic. Also,
add checks to avoid null pointer dereference.

CRs-Fixed: 2920490
Change-Id: I5a4f44f3d8f533f3a51e108472d5ccf93c261a98
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-04-19 11:25:07 -07:00
Anand Ravi
de6ee5504a msm: camera: isp: Remove CPAS version check from IFE HW manager
Calculate number of full and lite IFE to map hardware index to IFE
hardware number instead of extending the function for each new hardware.

CRs-Fixed: 2926668
Change-Id: I992d52232ff85b12aa2b1cbc43232742e980b34a
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-04-19 08:45:09 -07:00
Haibin Liu
693c6dfdae msm: camera: reqmgr: add trace log for separating multi camera
Based on link_hdl/sensor id, that can separate multi camera event
on reqmgr, apply request, bufdone, isp_active_irq.
Add log of link_hdl/sensor id in above trace event,
that systrace can show independent camera trace event.

CRs-Fixed: 2924042
Change-Id: I7088a8a489a05dae4e62dc131d1c0c45c72038e2
Signed-off-by: Haibin Liu <haibinl@codeaurora.org>
2021-04-19 21:51:51 +08:00
Jigar Agrawal
e3505ad43f msm: camera: sensor: Improve Logging
Improve Sensor logging for better debugging.

CRs-Fixed: 2924774
Change-Id: I386ce0fc634250003c05dea034ad60ea52f99678
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-04-16 15:07:12 -07:00
Karthik Anantha Ram
fdc5430f3e msm: camera: utils: Modify pointer check for clk debugfs
Modify pointer check when creating clk debugfs in soc utils.

CRs-Fixed: 2841729
Change-Id: I4d23c94cc5424809e445ba7e6321a568e14bfe5f
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-04-16 09:46:17 -07:00
Anand Ravi
bfb4abe3f9 msm: camera: isp: Modify state of WM node only on successful acquire
WM isp resource node state is modified before the acquire is a success.
Subsequent calls to acquire fail because of incorrect resource state.

Also, release WM on unsuccessful comp group acquire.

CRs-Fixed: 2924856
Change-Id: I7fe4ce16cabf5443e2c832d1e4fdcf8d65226d00
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-04-15 19:54:26 -07:00
Jigar Agrawal
74135ec470 msm: camera: csiphy: Add support for delay in IRQ confiq
Add support to add a delay while programming the IRQ
settings. Also, correct the irq mask bring up sequence
for csiphy2.1.0.

CRs-Fixed: 2923706
Change-Id: I1ef5b078bd91e915b9e53305edc0034d62132831
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-04-15 18:29:18 -07:00
Haritha Chintalapati
f77f1673d3 Merge "msm: camera: isp: Add support for new CSID" into camera-kernel.lnx.5.0 2021-04-15 18:24:50 -07:00
Anand Ravi
d2e9a2b541 msm: camera: isp: Clear previous dual IFE sync config on release
Since IFE HW manager issues dual sync config command only after
acquiring IPP path, CSID driver must clear the dual sync config when IPP
path is released.

CRs-Fixed: 2914494
Change-Id: I5200f120d2fe8305b5692121a07f4e7af801975c
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-04-15 13:36:27 -07:00
Gaurav Jindal
2e4fcd36fa msm: camera: isp: Send correct cphy id to cphy driver
Correct the phy id to be sent while notify the errors from
CSID driver to csi phy driver.

CRs-Fixed: 2924001
Change-Id: I363dbed5e6edeeafd93d42838154fba30cb711c9
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2021-04-15 11:15:44 +05:30
Haritha Chintalapati
d62972c20f Merge "msm: camera: common: Use the appropriate header for spinlock" into camera-kernel.lnx.5.0 2021-04-14 19:20:47 -07:00
Karthik Anantha Ram
18485ef697 msm: camera: reqmgr: Remove debug flags when creating timer slab
Remove all the debug flags in cache create call. The change
also adds the destroy call during unbind for consistency.

CRs-Fixed: 2841729
Change-Id: I2e0a0e4f2ec9191a3159d77892ff292a0a3cc131
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-04-14 14:30:17 -07:00
Haritha Chintalapati
2c537f74d5 Merge "msm: camera: cpas: Fix camnoc bw calculation flag parsing" into camera-kernel.lnx.5.0 2021-04-13 19:30:57 -07:00
Haritha Chintalapati
e892f58b06 Merge "msm: camera: cdm: Update hang detect logic" into camera-kernel.lnx.5.0 2021-04-13 19:30:37 -07:00
Haritha Chintalapati
4c06d9bc13 Merge "msm: camera: ope: Update for new IQ modules" into camera-kernel.lnx.5.0 2021-04-13 19:30:19 -07:00
Haritha Chintalapati
cf41c1c81b Merge "msm: camera: ope: Dump stripe info at the time of hang" into camera-kernel.lnx.5.0 2021-04-13 19:30:06 -07:00
Haritha Chintalapati
75e7523d2d Merge "msm: camera: isp: Fix out of bounds access" into camera-kernel.lnx.5.0 2021-04-13 19:29:55 -07:00
Haritha Chintalapati
29eebb1ebf Merge "msm: camera: common: NULL pointer and array fixes" into camera-kernel.lnx.5.0 2021-04-13 19:29:45 -07:00
Haritha Chintalapati
8a157daab6 Merge "msm: camera: icp: Update IPE/BPS register header" into camera-kernel.lnx.5.0 2021-04-12 19:07:40 -07:00
Haritha Chintalapati
729397c303 Merge "msm: camera: isp: Pause the CRM timer in case of hardware errors" into camera-kernel.lnx.5.0 2021-04-12 19:07:25 -07:00
Karthik Anantha Ram
9f4f8e114c msm: camera: common: Use the appropriate header for spinlock
With the allow list tightened, use the right header for spinlock
usage. Change replaces usage of linux/spinlock.h to
linux/spinlock_types.h.

CRs-Fixed: 2841729
Change-Id: I0247501b765436099f75c9725e9f614f0873c888
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-04-12 14:42:58 -07:00
Mukund Madhusudan Atre
fc8edb0fa1 msm: camera: cpas: Fix camnoc bw calculation flag parsing
The camnoc max needed flag is stored for each tree node and
parsed once per level. Fix parsing of camnoc max needed flag.
Improve cpas logging. Part of this change fixes issue introduced
in: commit d099238a67 ("msm: camera: cpas: Update bus node
level parsing logic").

CRs-Fixed: 2841729
Change-Id: I55ff2265ee1491535f3e39e16920129e8dffc15a
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-04-12 11:42:47 -07:00
Karthik Anantha Ram
49b59c54c8 msm: camera: isp: Fix out of bounds access
On Waipio the CSID buf done controller handles only
1 register. In bus_ver3 top half we need to avoid
accessing the event status array beyond 1 element.

CRs-Fixed: 2841729
Change-Id: I3588b2cb23d57e0d9a89830e33d8aed19b1f67ff
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-04-12 10:21:48 -07:00
Wyes Karny
4e535ac459 msm: camera: isp: Add support for new CSID
Add CSID640 support. The following features support are added:
  - QCFA binning and BAYER binning support
  - Format measure support
  - Multi VC DT support
  - Add core_cfg support in in_port structure

CRs-Fixed: 2887030
Change-Id: Idd7d081c985f3ef21e0fee7ce4c1b8db96ddd3c3
Signed-off-by: Wyes Karny <wkarny@codeaurora.org>
2021-04-12 01:34:13 -07:00
Savita Patted
0e433beabb Merge "msm: camera: isp: Add path to port mapping" into camera-kernel.lnx.5.0 2021-04-09 14:59:30 -07:00