Commit Graph

2109 Commits

Author SHA1 Message Date
Gaurav Jindal
f2cad8ef24 msm: camera: isp: Add support for RDI LCR
For spectra 780, one of the RDI inputs can serve
as an input to LCR in PDAF block inside IFE using
mux.
It  needs programming of top wrapper registers in CSID
and mux related registers in IFE.
At bus side, mipi packing needs to be used as the
output from CSID will be Plain16.
This commit adds support for the above requirements.

CRs-Fixed: 2948116
Change-Id: I425e4aa5ed58dd4214a1f11865359b3fc06d1b0d
Signed-off-by: Gaurav Jindal<gjindal@codeaurora.org>
2021-10-21 13:41:33 +05:30
Camera Software Integration
74ae961cc1 Merge "msm: camera: core: Delete request from pending list in case of error" into camera-kernel.lnx.5.0 2021-10-19 14:43:46 -07:00
Camera Software Integration
277c01613e Merge "msm: camera: cre: add degug fs entry to update clock rate" into camera-kernel.lnx.5.0 2021-10-19 14:43:37 -07:00
Camera Software Integration
272bbd9200 Merge "msm: camera: common: Fix kernel code and add checks" into camera-kernel.lnx.5.0 2021-10-18 16:43:42 -07:00
Camera Software Integration
7908b9520e Merge "msm: camera: csiphy: Update the csiphy bringup sequence" into camera-kernel.lnx.5.0 2021-10-18 16:43:25 -07:00
Savita Patted
b03c35a297 Merge "msm: camera: isp: Add recovery support for custom AEB use-case" into camera-kernel.lnx.5.0 2021-10-15 23:35:41 -07:00
Savita Patted
9ba991c21a Merge "msm: camera: isp: Update reapply field in config args" into camera-kernel.lnx.5.0 2021-10-15 23:35:24 -07:00
Savita Patted
88de9bde7d Merge "msm: camera: isp: Add common utility functions" into camera-kernel.lnx.5.0 2021-10-15 23:35:09 -07:00
Savita Patted
ad95974a84 Merge "msm: camera: isp: Split event handler based on HW type" into camera-kernel.lnx.5.0 2021-10-15 23:34:50 -07:00
Savita Patted
a89651c3b0 Merge "msm: camera: isp: Apply scratch only on SOF trigger" into camera-kernel.lnx.5.0 2021-10-15 23:34:34 -07:00
Camera Software Integration
ad7e6fe867 Merge "msm: camera: csiphy: Enable PN9 infinite loop for test" into camera-kernel.lnx.5.0 2021-10-14 16:56:12 -07:00
Camera Software Integration
6432cff2d8 Merge "msm: camera: ife: Program image addr for once in RDI batch mode" into camera-kernel.lnx.5.0 2021-10-14 16:55:48 -07:00
Camera Software Integration
c469b0db2d Merge "msm: camera: common: Make msg_cb for cam_subdev generic" into camera-kernel.lnx.5.0 2021-10-14 16:55:23 -07:00
Jigar Agrawal
890c319fc8 msm: camera: common: Fix kernel code and add checks
Fix Kernel code and add security checks to avoid
possible out of bound array access variables.

CRs-fixed: 3038735
Change-Id: Idaf0889026dbf138d0cb94a0f88e5b6941ff21e2
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-10-14 11:11:42 -07:00
Karthik Anantha Ram
1da4fb571f msm: camera: isp: Add recovery support for custom AEB use-case
Add support to detect error scenarios, propagate the error
appropriately, halt IFE and recover on such error scenarios.
The change is to only handle such cases for custom AEB
use-case.

CRs-Fixed: 3045706
Change-Id: Iba4744e524523d131555e4a44f6ce7acc97633b5
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-10-14 09:23:54 -07:00
Vikram Sharma
5ea2e174a8 msm: camera: cre: add degug fs entry to update clock rate
This change adds a debug fs entry to run cre on specified
clock.

CRs-Fixed: 3056442
Change-Id: I85bcdfa90ceae6dac5e23b87e1338cd3f3092fa6
Signed-off-by: Vikram Sharma <vikramsa@codeaurora.org>
2021-10-14 02:13:24 -07:00
Gaurav Jindal
1414b82cc2 msm: camera: core: Delete request from pending list in case of error
While preparing hw for request, there is a possiblity of receiving
invalid sync object. In this case, we need to return error. By this
time, the request is already in pending list. While returning error,
request is moved back to free list. But deleting from the pending list
was missed.
This commit deleted the request from the pending list if the sync object
received is invalid.

CRs-Fixed: 2660625
Change-Id: Id619452889476b0c2811c8560361205b0d89bcb9
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2021-10-13 21:39:11 -07:00
Jigar Agrawal
f75337c991 msm: camera: csiphy: Update the csiphy bringup sequence
Update 1.2Gsps datarate specific sequence to improve the
csiphy response and add margin for the boards with larger
insertion loss. New setting adds robustness to the csiphy
operation.

CRs-Fixed: 3042875
Change-Id: I6e93d35a6a026613eb6879f07759acef05e31794
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-10-13 17:03:09 -07:00
Jigarkumar Zala
daead670e6 msm: camera: csiphy: Enable PN9 infinite loop for test
Enable PN9 infinite loop for test. Also move the PN9 status
check from polling to one time read at streamoff.

CRs-Fixed: 3054225
Change-Id: Ia4d8ff17e3c78f37adb68ad9a4afb076fe2bda45
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2021-10-13 12:13:33 -07:00
Karthik Anantha Ram
66b3f46f58 msm: camera: isp: Update reapply field in config args
Currently reapply field in config args signifies applying
only IO buffers. Update that field as an enum providing
the provision to reapply IQ or IO accordingly.

CRs-Fixed: 3045706
Change-Id: Id10ee846a6de093e5a79858689802e421628ce56
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-10-13 11:42:21 -07:00
Karthik Anantha Ram
b48f4da577 msm: camera: isp: Add common utility functions
Add common utility functions to be used across isp
context. Util functions added to notify trigger points,
notify errors, pause CRM SOF timer and trigger register dumps.
The change also modifies certain pointer validations to
accomplish this.

CRs-Fixed: 3045706
Change-Id: I3cb19e9a24ffb82ff25e7c278b31a8bf0e854eed
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-10-13 11:42:08 -07:00
Karthik Anantha Ram
69919eb973 msm: camera: isp: Split event handler based on HW type
Based on whether the event posted to HW mgr is from CSID/IFE/SFE,
handle them accordingly. This change avoids breaking off new
functions in existing calls for different events, instead
have an independent handler for each HW type.

CRs-Fixed: 3045706
Change-Id: I139514d9028c6d613f1bc7403014474dc336df34
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-10-13 11:41:38 -07:00
Karthik Anantha Ram
498012e556 msm: camera: isp: Apply scratch only on SOF trigger
It's possible that CRM triggers frame skip call at SOF
and EOF. For IFE ignore the call on EOF. Only use
SOF trigger to apply default settings [scratch buffers],
for fetch engine use-cases.

CRs-Fixed: 3055035
Change-Id: Ic0b59e5beb6dff70bb1b515117f0b641d8e09308
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-10-13 11:40:17 -07:00
Camera Software Integration
21d78e35c1 Merge "msm: camera: common: Add wrapper for presil locking" into camera-kernel.lnx.5.0 2021-10-12 19:30:53 -07:00
Camera Software Integration
79879d890a Merge "msm: camera: common: fix map check failure for presil buffer send" into camera-kernel.lnx.5.0 2021-10-12 19:30:44 -07:00
Haritha Chintalapati
8451fc8e8c Merge "msm: camera: cdm: Fix cdm driver for bufffer excursion" into camera-kernel.lnx.5.0 2021-10-11 21:10:23 -07:00
Haritha Chintalapati
cc34998f9a Merge "msm: camera: isp: Handle RUP for enabled CSID CAMIF IRQs" into camera-kernel.lnx.5.0 2021-10-11 21:10:13 -07:00
Haritha Chintalapati
0af295b8f6 Merge "msm: camera: reqmgr: Fix the crm driver" into camera-kernel.lnx.5.0 2021-10-11 21:10:03 -07:00
Haritha Chintalapati
ace7a6a26e Merge "msm: camera: isp: Fix BW voting corruption in top layer" into camera-kernel.lnx.5.0 2021-10-11 21:09:52 -07:00
Suraj Dongre
1d86110d7b msm: camera: common: Add wrapper for presil locking
Presil IRQ handling requires running in a workqueue, with
wait for acknowledgement in io operations. This busy wait
should be done while holding a mutex lock as opposed to
spinlock in usual irq context. Add wrapper to switch from
spinlock to mutex for presil mode in irq controller and
cdm. Add the hw lock wrapper in hw interface header.

CRs-Fixed: 2932495
Change-Id: I7600eb1e6ae8746a39e76f6cb3a2652b255f2ddd
Signed-off-by: Suraj Dongre <sdongre@codeaurora.org>
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-10-11 10:34:34 -07:00
Savita Patted
c38139d8da Merge "msm: camera: cpas: Add support for Diwali Camera" into camera-kernel.lnx.5.0 2021-10-08 17:20:40 -07:00
Savita Patted
3c4809d109 Merge "msm: camera: req_mgr: Rearrange state change sequence" into camera-kernel.lnx.5.0 2021-10-08 17:20:07 -07:00
Mukund Madhusudan Atre
5c479c94dd msm: camera: isp: Fix BW voting corruption in top layer
Currently, the structure used to aggregate incoming votes
from ife hw manager is declared as static. This is an issue
in case of multi-context camera. Add the aggregated incoming
vote entry in VFE/SFE top so that it is accessed per HW core only.

CRs-Fixed: 3008062
Change-Id: Ib174925cba3aeb86b8704fc68d6f444f476f01e6
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-10-07 09:38:11 -07:00
Gaurav Jindal
931927867f msm: camera: isp: Handle RUP for enabled CSID CAMIF IRQs
CAMIF interrupts in CSID are enabled based on use case requirements.
In additionto this, inside hw manager propagation to isp context is
again dependent on the same checks. Since the enabling is based
on use-case, the checks in the handler functions are redundant.
With upgrades in hardware, the checks are increasing while handling
in hw manager.
This commit removes the checks in handler function in hw manager.

CRs-Fixed: 3052221
Change-Id: I44f59b782dba0f7e7eb20c2ace56f3094527932b
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2021-10-07 14:33:55 +05:30
Jigar Agrawal
41d8370e72 msm: camera: reqmgr: Fix the crm driver
Add a check in the request manager code
to prevent the possible out of bound
array access.

CRs-Fixed: 3051099
Change-Id: I4b4ec5778d83aa8993225cae0cd599a02f526082
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-10-06 21:57:30 -07:00
Camera Software Integration
e15c969d3b Merge "msm: camera: uapi: Add new event causes" into camera-kernel.lnx.5.0 2021-10-06 17:45:45 -07:00
Camera Software Integration
af97f4555c Merge "msm: camera: isp: Add header file VFE and CSID for Diwali" into camera-kernel.lnx.5.0 2021-10-06 17:45:17 -07:00
Camera Software Integration
fc8becbc86 Merge "msm: camera: reqmgr: Only do self correction after initial sync" into camera-kernel.lnx.5.0 2021-10-06 17:42:05 -07:00
Camera Software Integration
515058f728 Merge "msm: camera: icp: add mechanism to send/receive buffer for presil" into camera-kernel.lnx.5.0 2021-10-06 17:41:27 -07:00
Camera Software Integration
be297775bc Merge "msm: camera: csiphy: Extend CSIPHY hw block support" into camera-kernel.lnx.5.0 2021-10-06 17:41:14 -07:00
Camera Software Integration
f37941cead Merge "msm: camera: isp: shdr enable pdaf occur overflow" into camera-kernel.lnx.5.0 2021-10-06 17:41:00 -07:00
Camera Software Integration
cec3be6ab1 Merge "msm: camera: common: Add presil compilation and probe support" into camera-kernel.lnx.5.0 2021-10-06 17:40:50 -07:00
Camera Software Integration
1f9de29a6d Merge "msm: camera: cci: Increase HW block support for CCI" into camera-kernel.lnx.5.0 2021-10-06 17:40:35 -07:00
Camera Software Integration
ce1580456e Merge "msm: camera: isp: Update last applied MUP for scratch" into camera-kernel.lnx.5.0 2021-10-06 17:40:24 -07:00
Camera Software Integration
7506e430e7 Merge "msm: camera: isp: Add bw info dump on clk/bw update error" into camera-kernel.lnx.5.0 2021-10-06 17:36:40 -07:00
Camera Software Integration
ee8903886b Merge "msm: camera: cdm: Correct the CDM iommu handle" into camera-kernel.lnx.5.0 2021-10-06 17:36:07 -07:00
Jigar Agrawal
6c91eb5bf0 msm: camera: cdm: Fix cdm driver for bufffer excursion
Update the cdm submit bl function to use allocated
genirq memory for genirq command instead of appending
the command to the last BL entry to prevent possibly
using the memory not mapped. Also, add some more logs
to make the debugging easier.

CRs-fixed: 3029732
Change-Id: I2fc679bef4c0f72031798a03b26f840b6b4ef746
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-10-06 12:27:35 -07:00
Suraj Dongre
0fe49d5aa7 msm: camera: common: fix map check failure for presil buffer send
Add correct way to check if buffer can be sent to hw in below cases.
1. buffer handle mapped twice, resulting into two entries in buf_q.
   One entry without smmu mapping and one with smmu mapping.
   fixed by checking if another entry with smmu map exists for i_no.
2. blob cmd buffer, packet buffer are shared only between umd and kmd.
   send_buffer_to_presil expected to be called and return success.

CRs-Fixed: 2932495
Change-Id: I2dd884b7dd16c5c45d3dfc25380d039b92199319
Signed-off-by: Suraj Dongre <sdongre@codeaurora.org>
2021-10-06 11:49:41 -07:00
Ayush Kumar
da55dd5e51 msm: camera: cpas: Add support for Diwali Camera
Diwali has different version of CPAS version which
requires camnoc interface changes and CPAS version
change. This change adds the same.

CRs-Fixed: 3043114
Change-Id: I698b251c43d34225053ab3a0e9c581201d6be638
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2021-10-05 23:34:39 +05:30
Camera Software Integration
40300a2a04 Merge "msm: camera: csiphy: Update AFE settings for cphy sensors" into camera-kernel.lnx.5.0 2021-10-04 17:32:58 -07:00