Commit Graph

986 Commits

Author SHA1 Message Date
Ravikishore Pampana
e9fb6cfda6 msm: camera: reqmgr: Add checks before reporting the error
Add the null check for dev parameter before reporting the error on
link. Certain corner scenario for flash, send request return native
value in that case dev parameter could be null.

CRs-Fixed: 2814597
Change-Id: Ibe08f12c2f2c1864c46b17b0ae0f8df5c5648d35
Signed-off-by: Ravikishore Pampana <rpampana@codeaurora.org>
2020-11-17 06:06:25 -08:00
Pavan Kumar Chilamkurthi
4c4ed69a5c msm: camera: isp: Handle buf_done without request in active_list
In cases where we see a buf done without request being in
active_list, there could be a possibility that the request
is applied just before SOF, RUP but the context state is
not moved to Applied state, at this time the request is in
wait_list. In such cases RUP event doesn't move the request
into active_list. Also if the BUF_DONE on a port is happening
before EPOCH, we simply drop that BUF_DONE and then the request
will eventually be tagged as BUBBLE at the time of EPOCH. But
since BUF_DONE is dropped, the request will never come out of
BUBBLE. To handle such cases and to come out of BUBBLE,
check if BUF_DONE matches with the request in wait_list by
checking last_consumed address and if so, mark it as deferred
buf_done and handle once the request is moved to active_list.

CRs-Fixed: 2814346
Change-Id: I778a6a684076d5327d536f319a23206ccc0c25b6
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2020-11-14 00:56:16 -08:00
Haritha Chintalapati
2dc8859361 Merge "msm: camera: isp: Bubble re-apply with CDM callback detect" into camera-kernel.lnx.4.0 2020-11-13 13:32:03 -08:00
Haritha Chintalapati
d9aa9104b8 Merge "msm: camera: ife: Fix Constraint error print" into camera-kernel.lnx.4.0 2020-11-12 13:44:51 -08:00
Haritha Chintalapati
31615a50c2 Merge "msm: camera: isp: Add checks to ensure valid out resource info in dump" into camera-kernel.lnx.4.0 2020-11-11 13:58:21 -08:00
Camera Software Integration
46d760366f Merge "msm: camera: isp: Add trigger id for EOF event" into camera-kernel.lnx.4.0 2020-11-11 13:57:44 -08:00
Chandan Kumar Jha
5e697fee2a msm: camera: ife: Fix Constraint error print
Fixes the null pointer dereference in the print Constraint error
function.

CRs-Fixed: 2815855
Change-Id: I1ce982dd271e379b0a24e094b83a52f4dfb36e37
Signed-off-by: Chandan Kumar Jha <cjha@codeaurora.org>
2020-11-11 16:49:43 +05:30
Wyes Karny
9075af0870 msm: camera: isp: Bubble re-apply with CDM callback detect
Re-apply bubble request if buf done has not come for 2 bubble frames.
Also before re-submitting the request to CDM check if CDM callback for that
request has come or not, if CDM callback is received then wait for buf
done else reset CDM and re-submit the request to CDM.

CRs-Fixed: 2807378
Change-Id: I1fd209482e14d58aa48d12194084d0a2ab943e31
Signed-off-by: Wyes Karny <wkarny@codeaurora.org>
2020-11-11 10:49:23 +05:30
Haritha Chintalapati
da1731a155 Merge "msm: camera: isp: Wait for cdm submit incase of custom HW" into camera-kernel.lnx.4.0 2020-11-10 18:13:19 -08:00
Haritha Chintalapati
b9c46ed8c0 Merge "msm: camera: custom: Add support for bubble handling" into camera-kernel.lnx.4.0 2020-11-10 18:13:10 -08:00
Haritha Chintalapati
17af990ff6 Merge "msm: camera: reqmgr: Remove idx check when detecting congestion" into camera-kernel.lnx.4.0 2020-11-10 18:12:57 -08:00
Haritha Chintalapati
22674ab994 Merge "msm: camera: isp: Fixing KW errors" into camera-kernel.lnx.4.0 2020-11-09 13:35:54 -08:00
Haritha Chintalapati
692dd76c99 Merge "msm: camera: isp: Skip qtimer shutter for invalid req_id" into camera-kernel.lnx.4.0 2020-11-09 13:35:29 -08:00
Depeng Shao
6103984425 msm: camera: isp: Add trigger id for EOF event
When we do flash operation in SHDR usecase, the
trigger count will mismatch if we don't pass
trigger id to CRM.

CRs-Fixed: 2813321
Change-Id: Ic557f1122f8698f987d249fe1d15e35b90326e1d
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2020-11-09 17:43:06 +08:00
Mukund Madhusudan Atre
eafe327153 msm: camera: isp: Add checks to ensure valid out resource info in dump
Currently, in case of violation on camif side, we initiate hw dump
with event info havinf input resource id. This resource id is not
applicable on vfe bus side. Add necessary check to ensure only valid
vfe out resource info is dumped.

CRs-Fixed: 2814398
Change-Id: Ifc7bac81e7a4d9993e1492b609b84d64ea3fd1f4
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-11-08 02:12:16 -08:00
Haritha Chintalapati
cdb34b148c Merge "msm: camera: isp: Handle QCFA bin eanbled case for MP limit fuse" into camera-kernel.lnx.4.0 2020-11-06 17:23:44 -08:00
Haritha Chintalapati
c03621dca8 Merge "msm: camera: isp: Change dual IFE acquire sequence" into camera-kernel.lnx.4.0 2020-11-06 17:23:28 -08:00
Karthik Anantha Ram
de3c732e6c msm: camera: reqmgr: Remove idx check when detecting congestion
Remove last applied idx check when detecting workq delays.

CRs-Fixed: 2801863
Change-Id: I85fe5aa9af446b25a3dd139a75cf1ed6b2a1253c
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-11-06 10:10:24 -08:00
Chandan Kumar Jha
50e3fc5c42 msm: camera: isp: Fixing KW errors
Fixes KW errors for ISP.

CRs-Fixed: 2813979
Change-Id: I5b09b1c5a678352c2f2d467c6e8bbf587c1f8e35
Signed-off-by: Chandan Kumar Jha <cjha@codeaurora.org>
2020-11-06 15:43:00 +05:30
Haritha Chintalapati
a993be775c Merge "msm: camera: isp: Move the CSID irq logs to bottom half" into camera-kernel.lnx.4.0 2020-11-05 14:04:26 -08:00
Haritha Chintalapati
19da7f0650 Merge "msm: camera: isp: Fix the callback arguments in IFE" into camera-kernel.lnx.4.0 2020-11-05 14:03:55 -08:00
Haritha Chintalapati
e3cca4c36a Merge "msm: camera: isp: Validate the ife bw blob data" into camera-kernel.lnx.4.0 2020-11-05 14:03:38 -08:00
Haritha Chintalapati
f040c20e68 Merge "msm: camera: ife: Fix bus print dimension" into camera-kernel.lnx.4.0 2020-11-05 14:03:18 -08:00
Haritha Chintalapati
857cbdaa51 Merge "msm: camera: tfe: Enable the tfe diag debug feature" into camera-kernel.lnx.4.0 2020-11-05 14:02:26 -08:00
Haritha Chintalapati
792be0d9c4 Merge "msm: camera: reqmgr: Fix timing issue while destroying the session" into camera-kernel.lnx.4.0 2020-11-05 14:02:08 -08:00
Karthik Anantha Ram
9ada4e4a26 msm: camera: custom: Add support for bubble handling
Add support for bubble handling in custom driver allowing
the custom block to re-apply bubbled request in sync with IFE.

CRs-Fixed: 2805278
Change-Id: I411d033f2470de3fab7587c7c019a933bda28020
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-11-05 09:53:54 -08:00
Wyes Karny
ab996a3ace msm: camera: isp: Handle QCFA bin eanbled case for MP limit fuse
When QCFA binning is enabled adjust MP limit fuse checking
to check actual proessing width for IFE.

CRs-Fixed: 2808086
Change-Id: I22af38ba36ad84372699a177c203c1acbae76cb9
Signed-off-by: Wyes Karny <wkarny@codeaurora.org>
2020-11-05 13:22:29 +05:30
Chandan Kumar Jha
68f9e9185d msm: camera: isp: Move the CSID irq logs to bottom half
Remove the sof log in CSID irq handler and handle it in the
Bottom half.Sof irq enabled during the sof freeze scenario
and sof log getting printed in the irq handler causing the
interrupt handling taking more time.

CRs-Fixed: 2804588
Change-Id: I9514bf79333665dcd9407932789ce00c4ed480d8
Signed-off-by: Chandan Kumar Jha <cjha@codeaurora.org>
2020-11-04 03:27:56 -08:00
Anand Ravi
55eb3c37f4 msm: camera: ife: Fix bus print dimension
Fixes the null pointer dereference in the print dimension function.

CRs-Fixed: 2809214
Change-Id: I6467f183cca9f665c89f1a418b320cd55be7700a
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2020-11-03 15:30:59 -08:00
Ravikishore Pampana
162bc103f2 msm: camera: tfe: Enable the tfe diag debug feature
Tfe sensor diag feature is not enabled properly. Enable
the diag feature based on the debug fs value. Log the
tfe measured sensor diag status for camif and rdi paths.

Enable the tfe diag status with below command
adb shell "echo 0x1 > /sys/kernel/debug/camera_ife/tfe_camif_debug".

CRs-Fixed: 2810952
Change-Id: I47cd57e38a38010fb7fba048c35e907e1980b797
Signed-off-by: Ravikishore Pampana <rpampana@codeaurora.org>
2020-11-02 23:14:44 -08:00
Karthik Anantha Ram
5ef9d03a86 msm: camera: isp: Wait for cdm submit incase of custom HW
If IFE is connected to custom HW in the pipeline, make the cdm
submit a blocking call to ensure settings are programmed to IFE
on time.

CRs-Fixed: 2805278
Change-Id: Ia0d771a0f875a3b41c67eef496a96461c579dac0
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-11-02 19:02:19 -08:00
Karthik Anantha Ram
0ce4dfa52b msm: camera: isp: Change dual IFE acquire sequence
In case of dual, acquire IFEs from a higher to lower idx.
The IFE with the higher hw_idx will be configured as slave.

CRs-Fixed: 2805265
Change-Id: I35e3af84e2ac6586056e6d74373642a85e5c797a
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-11-02 18:56:40 -08:00
Haritha Chintalapati
ce4e3d7296 Merge "msm: camera: smmu: Avoid NULL dereference in cam_smmu_alloc_firmware" into camera-kernel.lnx.4.0 2020-11-02 15:29:50 -08:00
Haritha Chintalapati
f7541e1999 Merge "msm: camera: reqmgr: Move skip frame log to rate limit for WQ congestion" into camera-kernel.lnx.4.0 2020-11-02 15:29:32 -08:00
Haritha Chintalapati
4afd2d107d Merge "msm: camera: cci: Add back mutex on cci" into camera-kernel.lnx.4.0 2020-11-02 15:28:50 -08:00
Ayush Kumar
ed6a1ed193 msm: camera: isp: Validate the ife bw blob data
If ife bandwidth number of paths configuration is zero then do not
proceed. Number of bandwidth paths should be minimum one and
should not be greater than max value.

CRs-Fixed: 2801769
Change-Id: I2bf5cd4ea76ca7ecd9ca968bced2957a76691001
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2020-11-02 17:39:31 +05:30
zhuo
ee8e8ee884 msm: camera: reqmgr: Fix timing issue while destroying the session
During destroying the session, sof freeze timeout happens
after destroying workqueue. Then sof freeze timeout callback
will access workqueue causing use after free memory issue.
This change invokes destroying timer prior to workqueue.

CRs-Fixed: 2807936
Change-Id: I1f0dcb7a03fbf802f4ec872727e3b627a78f56f8
Signed-off-by: zhuo <zhuo@codeaurora.org>
2020-10-30 15:39:24 +08:00
Jigar Agrawal
d3650f098c msm: camera: isp: Fix the callback arguments in IFE
Fix the callback arguments in IFE to avoid the CFI
check failure. A few callbacks invokes do not typecast for
the last argument of the event callback. Since callbacks
are indirect function call, CFI check for this will fail.

CRs-Fixed: 2807933
Change-Id: I4e72cf07de701bbfd8f7d7829207256918beeb4c
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2020-10-29 17:31:11 -07:00
Camera Software Integration
1d4846d08d Merge "msm: camera: jpeg: Add traces to profile jpeg processing time" into camera-kernel.lnx.4.0 2020-10-29 15:37:29 -07:00
Camera Software Integration
4ba4661231 Merge "msm: camera: cpas: Removing getting clk rate in cpas dump" into camera-kernel.lnx.4.0 2020-10-29 15:37:13 -07:00
Camera Software Integration
370725a4b0 Merge "msm: camera: ife: Add support for camera v680 bus" into camera-kernel.lnx.4.0 2020-10-29 15:36:57 -07:00
Camera Software Integration
7db6609786 Merge "msm: camera: vfe: Add support for new VFE hardware" into camera-kernel.lnx.4.0 2020-10-29 15:36:41 -07:00
Camera Software Integration
e57a660343 Merge "msm: camera: isp: Add UAPI changes for new VFE hardware" into camera-kernel.lnx.4.0 2020-10-29 15:36:26 -07:00
Camera Software Integration
5a2fb767ac Merge "msm: camera: icp: Support NRT ipe clock bump-up" into camera-kernel.lnx.4.0 2020-10-29 15:36:07 -07:00
Camera Software Integration
3d7b6af67c Merge "msm: camera: cpas: Update jpeg qosgen settings" into camera-kernel.lnx.4.0 2020-10-29 15:35:57 -07:00
Wyes Karny
22004e3a95 msm: camera: reqmgr: Move skip frame log to rate limit for WQ congestion
In the case of workqueue congestion move the skip frame logs to
rate info limit.

CRs-Fixed: 2800932
Change-Id: I96988ff73ae182d55eb3f3d15de9b02f13c34b39
Signed-off-by: Wyes Karny <wkarny@codeaurora.org>
2020-10-29 15:38:13 +05:30
Fernando Pacheco
4e09bf5f97 msm: camera: smmu: Avoid NULL dereference in cam_smmu_alloc_firmware
The iommu domain we grab from iommu_get_domain_for_dev can
be NULL. Eventually we will hit a NULL dereference in the
cam_smmu_alloc_firmware due to the missing check. Modify the
existing check to account for the possiblity of a NULL
domain and bail early.

CRs-Fixed: 2804766
Change-Id: I201260c3559b847cfb0bf7f85226816af148671d
Signed-off-by: Fernando Pacheco <fpacheco@codeaurora.org>
2020-10-28 15:46:13 -07:00
Camera Software Integration
bd56b374d0 Merge "msm: camera: sensor: Rename the dtsi entry to avoid the predefined string" into camera-kernel.lnx.4.0 2020-10-28 13:28:52 -07:00
Camera Software Integration
a7a72f3fae Merge "msm: camera: icp: Tidy up hfi queue dump" into camera-kernel.lnx.4.0 2020-10-28 13:28:44 -07:00
Camera Software Integration
d65b98953a Merge "msm: camera: tfe: Correct Configuration of top tpg mux selection" into camera-kernel.lnx.4.0 2020-10-28 13:28:10 -07:00