Commit Graph

1304 Commits

Author SHA1 Message Date
Anand Ravi
aadc0947af msm: camera: isp: Add last consumed address check for 680 hardware
Enable verifying last consumed address on 680 hardware.

CRs-Fixed: 2846451
Change-Id: I217e11a5fc7b56aeebd41ee06a7cf913e0cf18de
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-03-24 15:35:29 -07:00
Savita Patted
75f34dc77d Merge "msm: camera: isp: Print the faulting IFE/SFE module" into camera-kernel.lnx.5.0 2021-03-23 18:47:12 -07:00
Savita Patted
93be89f6f5 Merge "msm: camera: isp: Assign max hw update entries based on stream type" into camera-kernel.lnx.5.0 2021-03-23 18:46:51 -07:00
Savita Patted
dd01debce6 Merge "msm: camera: common: Use pdev name for soc dev name" into camera-kernel.lnx.5.0 2021-03-23 18:46:30 -07:00
Savita Patted
1258f67a3c Merge "msm: camera: isp: Address SFE BW issues" into camera-kernel.lnx.5.0 2021-03-23 18:45:54 -07:00
Savita Patted
17ab2b21c6 Merge "msm: camera: common: Add AON support" into camera-kernel.lnx.5.0 2021-03-23 18:44:50 -07:00
Savita Patted
a15b36d2db Merge "msm: camera: icp: Increase the max_in and out resource macros" into camera-kernel.lnx.5.0 2021-03-23 18:44:00 -07:00
Haritha Chintalapati
48101628b5 Merge "msm: camera: isp: Remove unnecessary bound check in bw update path" into camera-kernel.lnx.5.0 2021-03-22 16:35:51 -07:00
Karthik Anantha Ram
8ed5423b26 msm: camera: isp: Print the faulting IFE/SFE module
In case of a module hang apart from printing the debug status
registers print the faulting module name as well.

CRs-Fixed: 2841729
Change-Id: I43c34df1d667e77827fce50b312741449c1c4e17
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-03-21 20:32:33 -07:00
Karthik Anantha Ram
a17df881bf msm: camera: isp: Address SFE BW issues
Fix the logic classifying BW vote from userspace.
Correct log strings for SFE usage data.

CRs-Fixed: 2841729
Change-Id: Ife7eb5635e97b376a05696c1c5406972bcf4a7c8
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-03-21 20:27:17 -07:00
Pavan Kumar Chilamkurthi
7f750a59f0 msm: camera: common: Use pdev name for soc dev name
Having a global variable and using the same for all devices
will overwrite the name of previous device. Use pdev name
to be consistent and helps in debugging logs.

CRs-Fixed: 2901925
Change-Id: I086f3dbd12e720c5e6497355eae40ca242d3d408
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2021-03-20 19:48:08 -07:00
Karthik Anantha Ram
1f9c10f9c8 msm: camera: isp: Assign max hw update entries based on stream type
In case of SFE/CSID cmd buffer update, more number of hw update entries
is needed. Assign and allocate this memory dynamically based
on stream type. Also the change makes cdm cmd memory allocation
based on the stream.

CRs-Fixed: 2841729
Change-Id: Iaaa3ce7152a103ace25b24d84776f5a665603994
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-03-20 11:54:01 -07:00
Haritha Chintalapati
536d5a9599 Merge "msm: camera: reqmgr: Handle flash properly" into camera-kernel.lnx.5.0 2021-03-19 17:41:32 -07:00
Jigarkumar Zala
26cfdeb27c msm: camera: common: Add AON support
Add Main/Aon camera switch support for image sensor
and it's submodule. This change detects the AON support
from image sensor hw information from it's respective
device tree support. Also sensor needs to call csiphy
to do the cpas top level operation in order to program
the register for Main/AON mux operation, so add API
export from csiphy hw for sensor domain to perform
the operation.

CRs-Fixed: 2899541
Change-Id: Ibde3ce86c15cfd7e7f445f6461565f78a668b812
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2021-03-19 09:49:13 -07:00
Haritha Chintalapati
1e7f567b94 Merge "msm: camera: isp: SFE cleanup change" into camera-kernel.lnx.5.0 2021-03-18 20:12:17 -07:00
Haritha Chintalapati
9f29459fc2 Merge "msm: camera: isp: Change last_dump_err_req field to a bool" into camera-kernel.lnx.5.0 2021-03-18 20:11:54 -07:00
Haritha Chintalapati
f6cfd7fcc0 Merge "msm: camera: csiphy: add logic for csiphy shutdown" into camera-kernel.lnx.5.0 2021-03-18 20:11:40 -07:00
Haritha Chintalapati
f4e1d02d37 Merge "msm: camera: reqmgr: Improve CRM logging" into camera-kernel.lnx.5.0 2021-03-18 20:11:28 -07:00
Savita Patted
c9347b5866 Merge "msm: camera: cpas: Update QoS settings for v680 hardware" into camera-kernel.lnx.5.0 2021-03-18 12:55:21 -07:00
Karthik Anantha Ram
bcedf8dd86 msm: camera: icp: Increase the max_in and out resource macros
Increase these macros to accommodate MFHDR use-cases involving,
more inputs/outputs.

CRs-Fixed: 2841729
Change-Id: I360f5500c6a9a8e4e0ea3b25cf281187db639b2c
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-03-18 11:49:04 -07:00
Depeng Shao
a8fce31f3f msm: camera: reqmgr: Handle flash properly
Apply the flash at EOF and apply the other devices
at the EPOCH of next frame, then the flash can
cover all the exposure zone of current request.
Add the inject delay for SOF and EOF separate,
then we can use inject delay for more flexible
frame skip control.

CRs-Fixed: 2820683
Change-Id: Ic6a58327a0ae44c54190884ba42ea7926ec7c90e
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2021-03-18 15:30:48 +08:00
Mukund Madhusudan Atre
32e2da9905 msm: camera: isp: Remove unnecessary bound check in bw update path
Currently, iterating through all the possible split indexes will
always hit the check for max value at the end. Remove the check
as the KW error corresponding to it is false positive.

CRs-Fixed: 2841729
Change-Id: I8b555ab3c4680e348d3af1169d95b79e0d8572a9
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-03-17 23:16:12 -07:00
Karthik Anantha Ram
3e53f494b8 msm: camera: isp: Change last_dump_err_req field to a bool
In case of streams with no ePCR, and if error happens on the
very first frame reg dump on error is not triggered since
last_dump_err_req_id and applied_req_id both are 0x0. Change
it to a flag instead to avoid this scenario and reset the flag
at stream off/release.

CRs-Fixed: 2841729
Change-Id: Ieaee68c42fb2228dfa966a0ef158802a10694dca
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-03-17 10:45:57 -07:00
chengxue
a0e5135248 msm: camera: csiphy: add logic for csiphy shutdown
While csiphy is shutdown abnormally, we also need to
program off csiphy hw common register, to avoid the
residual of active csiphy hw cnt during monkey test.

CRs-Fixed: 2861912
Change-Id: I1767c729b205a96e5f298265e65b37150dac03b6
Signed-off-by: chengxue <chengxue@codeaurora.org>
2021-03-16 19:43:11 -07:00
Savita Patted
0626095cbc Merge "msm: camera: isp: Re-assign WMs for UAPI port names" into camera-kernel.lnx.5.0 2021-03-16 17:42:58 -07:00
Savita Patted
1b9a9b571f Merge "msm: camera: core: Allocate memory for flush req array dynamically" into camera-kernel.lnx.5.0 2021-03-16 17:42:38 -07:00
Savita Patted
7e3f0a107a Merge "msm: camera: common: Change the max base type for reg dump" into camera-kernel.lnx.5.0 2021-03-16 17:42:17 -07:00
Savita Patted
6ad996f234 Merge "msm: camera: isp: Update debug cfg for all paths" into camera-kernel.lnx.5.0 2021-03-16 17:41:59 -07:00
Savita Patted
ef326026ba Merge "msm: camera: isp: Remove IFE top core cfg in KMD for v4" into camera-kernel.lnx.5.0 2021-03-16 17:41:40 -07:00
Savita Patted
0bb300ac41 Merge "msm: camera: reqmgr: Mask re-apply for SHDR usecase" into camera-kernel.lnx.5.0 2021-03-16 17:40:26 -07:00
Karthik Anantha Ram
f561198bac msm: camera: isp: SFE cleanup change
Remove bus read blob config for SFE. Also correct
loop condition when printing SFE bus wr violation info.

CRs-Fixed: 2841729
Change-Id: Ia080da6e81ef7836a3ca013d78a2a3621daa547f
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-03-16 12:02:39 -07:00
Mukund Madhusudan Atre
bea29a5c28 msm: camera: cpas: Update QoS settings for v680 hardware
Add qosgen values and update existing values to match the
recommendation.

CRs-Fixed: 2841729
Change-Id: Ie1f331f9a30bba91d636fcdcca7507b5b4fce237
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-03-16 09:54:48 -07:00
Depeng Shao
b4d2d77fb9 msm: camera: reqmgr: Reset the trigger cnt when trigger cnt mismatch
In sHDR case, the trigger cnt may be different when one of the IFE
meet bubble or irq delay issue, then reset the trigger cnt when
we find the trigger cnt is different.

CRs-Fixed: 2857614
Change-Id: Ie02fd7204bebd16d32d7a277ac1f2e45f8357dd9
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2021-03-12 23:42:28 -08:00
Depeng Shao
1edfd82801 msm: camera: reqmgr: Mask re-apply for SHDR usecase
SHDR case has two ISP instances, if one of them
apply req failed sometimes, but the other one is
good and the buf done has been handled successfully,
then we don't need to apply the req again for the
successful ISP.

CRs-Fixed: 2842495
Change-Id: I3dfbb455244daa0d155858dd59f4a661fd3b87cd
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2021-03-12 23:42:05 -08:00
Depeng Shao
d0f46318e7 msm: camera: core: Allocate memory for flush req array dynamically
Allocate memory for flush req array dynamically based
on the list count, in case the req count bigger than
the size of req list.

CRs-Fixed: 2835525
Change-Id: I7e48fb9dc7815cb991c84195e761a3c3f1c26b48
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2021-03-12 23:40:43 -08:00
Karthik Anantha Ram
7409042572 msm: camera: common: Change the max base type for reg dump
With the newly added register base types for reg dump, the
validation needs to be changed to account for the new max.

CRs-Fixed: 2841729
Change-Id: I6babe7a1e4d6def51b8e433be4431f04a0a417e8
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-03-11 16:09:43 -08:00
Jigar Agrawal
cd5e3f033d msm: camera: reqmgr: Improve CRM logging
Add CSID hw index in crm logging for better debugging.

CRs-Fixed: 2898319
Change-Id: Ia378a2eaf51f9306b5f693ba7180dd44fc6ef74d
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-03-11 16:03:54 -08:00
Karthik Anantha Ram
c4eac8ce8d msm: camera: isp: Update debug cfg for all paths
Currently debug_cfg_en is listed only for IPP, update
the value for rest of the paths as well.

CRs-Fixed: 2841729
Change-Id: I19d8489d71468e49a594274f9198e9cb2841003c
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-03-11 16:02:33 -08:00
Karthik Anantha Ram
84a590926a msm: camera: isp: Remove IFE top core cfg in KMD for v4
The core config is programmed via CDM by userspace. Remove
the programming of these registers in kernel to avoid
any discrepancy.

CRs-Fixed: 2841729
Change-Id: Iea8b0843c8283dd6be2c98b4e5de9de7f8312b7e
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-03-11 15:56:36 -08:00
Karthik Anantha Ram
5ce6aebaad msm: camera: isp: Re-assign WMs for UAPI port names
Switch WMs for current 2PD and 2PD_STATS ports. Rename
2PD_STATS to PREPROCESS_2PD inline with UMD notion.

CRs-Fixed: 2841729
Change-Id: I735ef397cfd6328aa2fef73970def0b64044fe2e
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-03-11 15:52:10 -08:00
Haritha Chintalapati
fdf216909b Merge "msm: camera: isp: Add VFE/SFE overflow debug info" into camera-kernel.lnx.5.0 2021-03-11 14:58:27 -08:00
Haritha Chintalapati
afaa34315b Merge "msm: camera: isp: Reset the CSID debug info on release" into camera-kernel.lnx.5.0 2021-03-11 14:58:08 -08:00
Savita Patted
7d07226d92 Merge "msm: camera: sensor: Make some of the sensor enums uapi" into camera-kernel.lnx.5.0 2021-03-10 16:10:24 -08:00
Savita Patted
90fb1ebc6c Merge "msm: camera: isp: Allocate max map entries based on the stream type" into camera-kernel.lnx.5.0 2021-03-10 16:10:01 -08:00
Savita Patted
b3a6000ae7 Merge "msm: camera: common: Support compilation for new code base" into camera-kernel.lnx.5.0 2021-03-10 16:09:33 -08:00
Gaurav Jindal
b1bb0805a9 msm: camera: isp: Reset the CSID debug info on release
Reset the CSID debug info on release. Without releasing the
IRQ enabled for previous session will be trigerred in next session
as well.

Change-Id: I3d4dec4446926f60ba772a9608c96513a9919a4f
CRs-Fixed: 2830502
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2021-03-10 15:36:28 +05:30
Gaurav Jindal
ee3a268ce0 msm: camera: isp: Add VFE/SFE overflow debug info
For new targets, VFE/SFE overflow errors are back pressured to
CSID recovery module. Error IRQs are not available with VFE/SFE
blocks for such errors.
Above errors are to be propagated from CSID driver to downstream
module drivers to print the relevant debug data and handle
the error.
This commit implements propagation of error and
printing the debug info in VFE and SFE.

CRs-Fixed: 2830502
Change-Id: I24ecd7433b3324505e92d9d55576ca3107e66fdd
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2021-03-10 15:20:46 +05:30
Savita Patted
c3ecd6ea84 Merge "msm: camera: cdm: check reset status for error" into camera-kernel.lnx.5.0 2021-03-09 20:19:26 -08:00
Savita Patted
782ae622ba Merge "msm: camera: isp: Fix for disable UBWC case" into camera-kernel.lnx.5.0 2021-03-09 20:19:04 -08:00
Savita Patted
1ee4bca76c Merge "msm: camera: ope: Handle OPE smmu fault with pid info" into camera-kernel.lnx.5.0 2021-03-09 20:18:26 -08:00