Commit Graph

2043 Commits

Author SHA1 Message Date
sokchetra eung
56e4765c6a msm: camera: uapi: Add new event causes
Add new sync event causes for ICP, ISP, JPEG.
Add new ICP V4L2 error events.

CRs-Fixed: 3035452
Change-Id: Ie3a12281e7e6eeadc8361ba050ff51bdf80c4e65
Signed-off-by: sokchetra eung <eung@codeaurora.org>
2021-10-04 10:25:36 -07:00
Camera Software Integration
13d3e00200 Merge "msm: camera: reqmgr: Handle fatal error notification" into camera-kernel.lnx.5.0 2021-10-01 19:50:18 -07:00
Camera Software Integration
81e99709c3 Merge "msm: camera: isp: Add support of PDAF parsed outport" into camera-kernel.lnx.5.0 2021-10-01 19:50:07 -07:00
Camera Software Integration
87d033316b Merge "msm: camera: isp: Don't clear lists when disabling all events" into camera-kernel.lnx.5.0 2021-09-30 17:54:16 -07:00
Camera Software Integration
ad1e732da4 Merge "msm: camera: jpeg: Ensure in/out map entries are within allowed range" into camera-kernel.lnx.5.0 2021-09-30 17:54:02 -07:00
Camera Software Integration
9cbace3d87 Merge "msm: camera: isp: Correct the wrong res id" into camera-kernel.lnx.5.0 2021-09-30 17:53:36 -07:00
Camera Software Integration
a6d54a3219 Merge "msm: camera: req_mgr: Allow request cancellation if not applied to IFE" into camera-kernel.lnx.5.0 2021-09-29 15:57:59 -07:00
Camera Software Integration
cc960c0388 Merge "msm: camera: smmu: Unmap secure buffers in secure camera use case" into camera-kernel.lnx.5.0 2021-09-29 15:57:48 -07:00
Camera Software Integration
ae8ace5996 Merge "msm: camera: isp: Increase max dependents of IRQ controller" into camera-kernel.lnx.5.0 2021-09-29 15:57:38 -07:00
Camera Software Integration
02f11b69c4 Merge "msm: camera: common: Update bytes written variable" into camera-kernel.lnx.5.0 2021-09-28 16:43:55 -07:00
Camera Software Integration
5e9afd31bf Merge "msm: camera: isp: Add PID MID support for SFE" into camera-kernel.lnx.5.0 2021-09-28 16:43:32 -07:00
Depeng Shao
5cb86d5101 msm: camera: isp: Correct the wrong res id
This change corrects the wrong res id during checking
whether ife lite can be used in current usecase.

CRs-Fixed: 3046530
Change-Id: Ic24848fcd4aa85172e334a9de81c69dcdc9838cf
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2021-09-28 16:13:52 +08:00
Camera Software Integration
627ca795c4 Merge "msm: camera: common: Add condition for presil read poll" into camera-kernel.lnx.5.0 2021-09-27 17:10:54 -07:00
Camera Software Integration
740459b9f8 Merge "msm: camera: isp: Fix comp mask calculation during buf done" into camera-kernel.lnx.5.0 2021-09-27 17:10:31 -07:00
Camera Software Integration
474b417a55 Merge "msm: camera: reqmgr: Delay to do slot reset for finished req" into camera-kernel.lnx.5.0 2021-09-27 17:10:20 -07:00
Camera Software Integration
06a85e7f9b Merge "msm: camera: jpeg: Add null check for ctx_data in IRQ handler" into camera-kernel.lnx.5.0 2021-09-27 17:10:07 -07:00
Camera Software Integration
dec6040daa Merge "msm: camera: reqmgr: Add more error codes in uapi file" into camera-kernel.lnx.5.0 2021-09-27 17:09:57 -07:00
Camera Software Integration
84a665ef5c Merge "msm: camera: common: Fix kernel code and add checks" into camera-kernel.lnx.5.0 2021-09-27 15:37:10 -07:00
Camera Software Integration
9d778cd0cc Merge "msm: camera: csiphy: Add version check for secure mask" into camera-kernel.lnx.5.0 2021-09-27 15:36:52 -07:00
Camera Software Integration
fbced33fa6 Merge "msm: camera: isp: Add fixes for buf done in presil" into camera-kernel.lnx.5.0 2021-09-27 15:36:42 -07:00
Camera Software Integration
a41dc966a3 Merge "msm: camera: common: Add context flush state check" into camera-kernel.lnx.5.0 2021-09-27 15:36:33 -07:00
Camera Software Integration
094aa60747 Merge "msm: camera: cdm: Enhance CSID logs for debug purpose" into camera-kernel.lnx.5.0 2021-09-27 15:36:23 -07:00
Anand Ravi
0417e88967 msm: camera: req_mgr: Allow request cancellation if not applied to IFE
Since we don't wait for requests to be ready on lower pd devices before
applying request on higher pd devices, add provision to cancel request
if it has not been applied on IFE.

CRs-Fixed: 3014942
Change-Id: I8850b0dfe3f88e04b86f7bb6b597657ad7e0a4f9
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-09-27 14:41:03 -07:00
Shravya Samala
b281d0d19c msm: camera: jpeg: Ensure in/out map entries are within allowed range
Added checks to make sure in_map /out_map entries of
packet io configs are within expected maximum value.

CRs-Fixed: 3007258
Change-Id: I7e5a652cd8f9ae104a10a2af551fe49930849b2d
Signed-off-by: Shravya Samala <shravyas@codeaurora.org>
2021-09-28 00:11:48 +05:30
Karthik Anantha Ram
26f225b85b msm: camera: reqmgr: Handle fatal error notification
Handle fatal error notification by any device on the link.
On receiving the error propagate it to all connected devices.

CRs-Fixed: 3045706
Change-Id: Ia36a3262a48ea35afc8b98df21056461c5c523ef
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-09-27 11:18:56 -07:00
Anand Ravi
c213491c20 msm: camera: isp: Don't clear lists when disabling all events
On overflow, cam_irq_controller_disable_all function is called from top
half handler, which itself is in a loop of all entries of top half list.
Manipulating the list to remove all elements can leave it in an unstable
state and cause the loop to never terminate. Since events are removed
from all lists when unsubscribing from the IRQs, do not clear the top
half list when disabling all events.

CRs-Fixed: 3043489
Change-Id: Idee0a017cdea1dac73e9a7a00f07463afe324983
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-09-26 10:27:22 -07:00
Anand Ravi
b5a3c6c3bc msm: camera: isp: Increase max dependents of IRQ controller
SFE has two dependent controllers - bus write and bus read. Currently,
it max dependents is set to one so increase maximum dependents to fix
dependency registration failure.

CRs-Fixed: 3044375
Change-Id: Ib02490ef0016943d979506288d6192558b380534
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-09-24 13:03:02 -07:00
Jigar Agrawal
efff3f9490 msm: camera: csiphy: Update csiphy settings
Update the csiphy2.1.0 AFE settings.

CRs-Fixed: 3044363
Change-Id: I80ea12dcfe554e58599ce39348851a4279c4c53a
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-09-24 11:51:31 -07:00
Gaurav Jindal
03dedba588 msm: camera: common: Update bytes written variable
While dumping minidump information, bytes updated are wrongly
updated. This commit corrects that condition.

CRs-Fixed: 3044173
Change-Id: I5a6ac915118424b6ec3a2e64726786ed0e47c9c7
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2021-09-24 21:54:41 +05:30
Chandan Kumar Jha
738df632cc msm: camera: isp: Add support of PDAF parsed outport
Add support of new PDAF Parsed data outport for VFE 780.

CRs-Fixed: 2948116
Change-Id: Icd88e3947f6c1461c49ef6912985836931a1c62b
Signed-off-by: Chandan Kumar Jha <cjha@codeaurora.org>
2021-09-24 15:52:49 +05:30
Gaurav Jindal
8b1c004eac msm: camera: isp: Add PID MID support for SFE
This commit adds support for printing PID and MID in case
of page faults on SFE.

CRs-Fixed: 3040816
Change-Id: I99f8c6de6049802f7c67a72daf6c3fb24c3defb1
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2021-09-23 18:51:09 +05:30
chengxue
ad1a1dcfb2 msm: camera: reqmgr: Delay to do slot reset for finished req
For boken mode with hw sync enable, a link and its synclink
streaming with sync. if a bubble condition happens on a link,
and can not wait all buf done to clear the isp ctx
process_bubble flag in time, there may apply fails on isp
during the bubble recovery flow. current crm reset in_q slot
after req's report has finished. this may lead to a synclink
slot not found while do ready check.

So delay to do slot reset by referring the link delay.

CRs-Fixed: 2996710
Change-Id: Ice8c340a9f478a69d97e3a7c77e0d0a263be66fa
Signed-off-by: chengxue <chengxue@codeaurora.org>
2021-09-22 23:36:09 -07:00
Anand Ravi
d7eb296004 msm: camera: isp: Reset fence after signalling success
If fence is signalled successfully, reset it to -1 to prevent it from
getting signalled again incorrectly.

CRs-Fixed: 3042511
Change-Id: I87f465508e9e626ad700f592478f253f179e9fe9
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-09-22 15:05:54 -07:00
Suraj Dongre
d7b6770119 msm: camera: common: Add condition for presil read poll
Add presil read poll call in common poll timeout function
when presil mode is enabled.

CRs-Fixed: 2932495
Change-Id: Ib3cdf0e3963bd50fe6e0bd6e32cff7ff350f6125
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
Signed-off-by: Suraj Dongre <sdongre@codeaurora.org>
2021-09-21 13:39:51 -07:00
Mukund Madhusudan Atre
95cee39ce8 msm: camera: isp: Fix comp mask calculation during buf done
Currently, the shifted value we are providing to comp mask is
32-bit. The number of output ports have increased beyond 32,
and it requires for the correct bit to be set to report buf
done to context correctly. Extend the mask value calculation
to 64-bit.

CRs-Fixed: 2948116
Change-Id: I70e30fc44c178c04d0e962a31e4c48e3e5a13e75
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-09-21 12:41:25 -07:00
Jigar Agrawal
35a9822e03 msm: camera: common: Fix kernel code and add checks
Fix Kernel code and add security checks to avoid
possible null pointer dereference, out of bound
array access and accessing the uninitialized
variables. This change resolves following static
analysis issues:
568, 576, 577, 578, 4828, 4829, 4830, 4831, 4832,
4833, 4834, 4835, 4836, 4839, 4841, 4842, 5849,
9352, 9454, 9455.

CRs-fixed: 3038735
Change-Id: I16e437edbb444223ce9d275ed55089bd25a1294c
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-09-21 10:42:19 -07:00
Jigarkumar Zala
45bae36861 msm: camera: csiphy: Add version check for secure mask
CSIPHY version 2_1_0, secure phy mask is different for csiphy
hw 0/1/2/3  and hw 4/5. This needs to be configure before enabling
secure lanes. This change adds the appropriate version check to
perform this operation.

CRs-Fixed: 3039500
Change-Id: I8e856757886e880a6bf57ed4083ddf99cd325a7a
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2021-09-20 11:25:54 -07:00
Depeng Shao
c8ac17dee6 msm: camera: reqmgr: Fix request sync issues
Fix several request sync issues.

CRs-Fixed: 3029196
Change-Id: I92b4048b392fa19e2c9748a5ee0efd9ef0b4e680
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2021-09-20 13:04:31 +08:00
Camera Software Integration
e589c42a5b Merge "msm: camera: isp: Program MUP at stream on" into camera-kernel.lnx.5.0 2021-09-18 12:49:44 -07:00
Camera Software Integration
0a2a2dca28 Merge "msm: camera: reqmgr: Correct masked value for pending devices" into camera-kernel.lnx.5.0 2021-09-17 16:37:37 -07:00
Karthik Jayakumar
f31aaa8d2d msm: camera: jpeg: Add null check for ctx_data in IRQ handler
Check if ctx_data is null after assignment but before checking if it's in use.

CRs-Fixed: 3026736
Change-Id: I366383cbd30b7c22c16610d7b73e4e0ad8f74a55
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2021-09-17 16:03:07 -07:00
Mukund Madhusudan Atre
ead982b872 msm: camera: isp: Add fixes for buf done in presil
Currently, during verification of consumed address, we are not
taking into account the exapanded memory address that newer
targets have. Also, we are using wrong index for fence map
table, leading to supplying same resource handle for copying
buffer of different fence map entry, leading to empty frame.
Add correct comparision for consumed address and supply correct
index for fence map entry.

CRs-Fixed: 2932495
Change-Id: I1743d894ce47a51f2d93dc185865bb47b7655c05
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-09-16 20:02:34 -07:00
Jigar Agrawal
09cb87689f msm: camera: reqmgr: Add more error codes in uapi file
Add support for more error codes in the kernel code to
report more errors to user.

CRs-Fixed: 3026930
Change-Id: I430b26c285f1c9fcf0a4d7bb9a618bbbf7bf0662
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-09-16 17:50:15 -07:00
Camera Software Integration
624ee237ea Merge "msm: camera: sensor: Handle tpg shutdown properly" into camera-kernel.lnx.5.0 2021-09-16 16:37:54 -07:00
Camera Software Integration
36992ffa10 Merge "msm: camera: ife: Null pointer check for dump_data" into camera-kernel.lnx.5.0 2021-09-16 16:37:43 -07:00
Karthik Anantha Ram
35ad993892 msm: camera: isp: Program MUP at stream on
All the paths that are enabled program their RUP/AUP
respectively. At the end of that program MUP as well via
AHB. The change also removes programming MUP for scratch buffers.

CRs-Fixed: 3038703
Change-Id: I3b6b23bb9c6b7644b5943815253b965a40080973
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-09-16 14:20:28 -07:00
Shadul Shaikh
083480979f msm: camera: smmu: Unmap secure buffers in secure camera use case
Dettach and unmap DMA buffers obtained previously from DMA attach
and mappings respectively.

CRs-Fixed: 3014632
Change-Id: If8f8ebe9fc270f2ba39a9a42ab7c7bfb0f79c4eb
Signed-off-by: Shadul Shaikh <sshadu@codeaurora.org>
2021-09-15 12:23:50 -07:00
Haritha Chintalapati
4606441bc4 Merge "msm: camera: csiphy: Update the datarate settings for csiphy" into camera-kernel.lnx.5.0 2021-09-14 17:44:48 -07:00
Savita Patted
3d03b508ac Merge "msm: camera: smmu: Use device node to print node name" into camera-kernel.lnx.5.0 2021-09-13 17:35:03 -07:00
Savita Patted
ab01bad543 Merge "msm: camera: isp: Fix IFE and CSID presil issues for v780" into camera-kernel.lnx.5.0 2021-09-13 17:34:37 -07:00