Commit Graph

708 Commits

Author SHA1 Message Date
Haritha Chintalapati
f64d8b76f2 Merge "msm: camera: tfe: confine hw errata for bengal" into camera-kernel.lnx.4.0 2020-08-13 14:15:00 -07:00
Haritha Chintalapati
06a9ad0ba4 Merge "msm: camera: ife: Get consumed address info during hw_mgr init" into camera-kernel.lnx.4.0 2020-08-11 19:04:00 -07:00
Trishansh Bhardwaj
329870a013 msm: camera: tfe: confine hw errata for bengal
Confine bengal specific HW errata

CRs-Fixed: 2752895
Change-Id: I896b1f2e16adf917085e7056f08e87b212485dbb
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2020-08-11 23:52:07 +05:30
Camera Software Integration
a97830c5c3 Merge "msm: camera: csiphy: Add Skew calibration in DPHY Programming Sequence" into camera-kernel.lnx.4.0 2020-08-10 14:07:49 -07:00
Camera Software Integration
419c6369e6 Merge "msm: camera: csiphy: Add mipi flags to phy config" into camera-kernel.lnx.4.0 2020-08-10 14:07:17 -07:00
Camera Software Integration
6b2acb4c1f Merge "msm: camera: common: Avoid uninitialized accesses" into camera-kernel.lnx.4.0 2020-08-10 14:07:09 -07:00
Camera Software Integration
147f76cdb2 Merge "msm: camera: isp: Reset CSID sw register before reset clock domain" into camera-kernel.lnx.4.0 2020-08-10 14:07:02 -07:00
Depeng Shao
494ace8da7 msm: camera: ife: Get consumed address info during hw_mgr init
This change checks whether the context supports last consumed
address during hw_mgr init.

CRs-Fixed: 2749254
Change-Id: I238893eb2d661014a2a51758bcf71c3e4d00f2d5
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2020-08-08 12:35:35 +08:00
Camera Software Integration
2395072fee Merge "msm: camera: utils: Add CAM_IO_ACCESS log category" into camera-kernel.lnx.4.0 2020-08-07 14:51:10 -07:00
Camera Software Integration
797221b9f9 Merge "msm: camera: sensor: OIS lens position data infrastructure" into camera-kernel.lnx.4.0 2020-08-07 14:50:51 -07:00
Jigar Agrawal
ea7b6b2312 msm: camera: csiphy: Add Skew calibration in DPHY Programming Sequence
Update register pragramming sequence to account for signal skew calibration
for DPHY single and combo mode for per lane data rates higher than 1.5 Gbps
for CSIPHY1.2.3 and CSIPHY 2.1.0. Also, move settle time register update in
data specific table, as settle time is pre calculated based on datarate and
need to configure accordingly.

CRs-fixed: 2697576
Change-Id: I428d8d14887aa54ff22d727f80ee4a395be76baf
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2020-08-06 15:35:16 -07:00
Shravan Nevatia
a58f2a9d27 msm: camera: csiphy: Add mipi flags to phy config
-Add mipi flags mask to phy cmd buffer.
-Enable skew calibration settings only if the
corresponding flag is set.

CRs-fixed: 2697576
Change-Id: I0353e57daf49ce15d7573b57dbaa9363dbc59635
Signed-off-by: Shravan Nevatia <snevatia@codeaurora.org>
2020-08-06 14:09:06 -07:00
Fernando Pacheco
0d784286a9 msm: camera: common: Avoid uninitialized accesses
Improve the error-handling code paths to prevent accesses to
uninitialized variables. This is done by either picking a sane
default for the variable or skipping accesses altogether after
an unsuccessful attempt to initialize.

CRs-Fixed: 2748220
Change-Id: Ibe383e56ec4e3f45f76f619c7d6b62c3d7dfcadb
Signed-off-by: Fernando Pacheco <fpacheco@codeaurora.org>
2020-08-06 13:41:05 -07:00
Camera Software Integration
19ebf24ab1 Merge "msm: camera: icp: Increase request queue depth for ICP contexts" into camera-kernel.lnx.4.0 2020-08-06 12:28:02 -07:00
Depeng Shao
00b8521d2a msm: camera: isp: Reset CSID sw register before reset clock domain
Reset CSID SW register firstly to cut off potential input source
before reset the HW logic, then HW logic won't get junk data.

CRs-Fixed: 2731158
Change-Id: I9c8e1f3776229bf96c0c712de8c083b1334702ef
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2020-08-06 15:55:04 +08:00
Mukund Madhusudan Atre
397fcc6f55 msm: camera: utils: Add CAM_IO_ACCESS log category
Currently, CAM_UTIL debug logs when enabled, flood the logcat
with io read/write access logs, which are not necessary when
debugging clocks, interrupts and other parameters. Add separate
entry for IO access in debug util.

CRs-Fixed: 2743063
Change-Id: Id13393211bcc6fdc620aaffe8f8ab27a6b7c6986
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-08-05 15:20:17 -07:00
Camera Software Integration
e3c7dd3683 Merge "msm: camera: cpas: Correct QoS setting for holi" into camera-kernel.lnx.4.0 2020-08-05 14:22:51 -07:00
Fernando Pacheco
8d1b53b022 msm: camera: icp: Increase request queue depth for ICP contexts
Some usecases need more than the original max depth of 20 for ICP
contexts. Accommodate these usecases by increasing the max request
depth only for ICP.

CRs-Fixed: 2739277
Change-Id: Ibeda16aa439b49815cbefc3a76580092351c3572
Signed-off-by: Fernando Pacheco <fpacheco@codeaurora.org>
2020-08-04 09:55:07 -07:00
Trishansh Bhardwaj
812fe415ad msm: camera: cpas: Correct QoS setting for holi
Correct PRIORITYLUT_LOW for holi tfe.

CRs-Fixed: 2747287
Change-Id: I5799f56ac93891b00578d63f64c23a0e4a2f69da
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2020-08-04 15:06:56 +05:30
Depeng Shao
86f144a267 msm: camera: isp: Handling IRQ delays
Checking the BUS write client last consumed
address, if it matches with next request port
io buffer address, then irq delay detected.
We can signal port fence for both active request.

CRs-Fixed: 2684890
Change-Id: I8265c06a2284897d43e9a24511ad2c13c9690186
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2020-08-04 12:00:00 +08:00
Camera Software Integration
c5f4a2def3 Merge "msm: camera: common: Improve IFE and CSIPhy logging" into camera-kernel.lnx.4.0 2020-07-31 15:34:56 -07:00
Sureshnaidu Laveti
893a5afdbf msm: camera: sensor: OIS lens position data infrastructure
Add support to read OIS lens position data and
current Qtimer value.
Add support to write qtimer time stamp to OIS FW.

CRs-Fixed: 2721489
Change-Id: I7a4f4d342ff41c72db892ea706d0cfd6d667d96d
Signed-off-by: Sureshnaidu Laveti <lsuresh@codeaurora.org>
2020-07-31 14:55:36 -07:00
Camera Software Integration
1af3ec8d9d Merge "msm: camera: common: Add support of PHY TPG deinitialization" into camera-kernel.lnx.4.0 2020-07-29 12:51:57 -07:00
Jigar Agrawal
17f1383e33 msm: camera: common: Improve IFE and CSIPhy logging
Remove unnecessary logs from ife start, stop
and release routines. Add secure mode to CSIPHY logging.

CRs-Fixed: 2709537
Change-Id: Ib58d008cff5fef3d75f19c88aab76a85b5dc2e89
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
Signed-off-by: Jeyaprakash Soundrapandian <jsoundra@codeaurora.org>
2020-07-28 16:52:17 -07:00
Camera Software Integration
12fbb55700 Merge "msm: camera: ope: Fix unsequenced clang warning" into camera-kernel.lnx.4.0 2020-07-28 16:13:04 -07:00
Camera Software Integration
9ef363c051 Merge "msm: camera: sensor: unregister subdev if cpas registration fails" into camera-kernel.lnx.4.0 2020-07-28 16:12:55 -07:00
Camera Software Integration
ed39aa54a0 Merge "msm: camera: isp: Remove bubble re-apply recovery mechanism" into camera-kernel.lnx.4.0 2020-07-28 16:12:42 -07:00
Haritha Chintalapati
73b9674d4d Merge "msm: camera: sensor: Only handle the valid request" into camera-kernel.lnx.4.0 2020-07-27 13:39:23 -07:00
Haritha Chintalapati
cbfca9ab29 Merge "msm: camera: csiphy: add 1.2.5 version phy for holi camera as per hpg" into camera-kernel.lnx.4.0 2020-07-27 13:39:15 -07:00
Haritha Chintalapati
f91e158abf Merge "msm: camera: req_mgr: Support for 3 links in CRM" into camera-kernel.lnx.4.0 2020-07-27 13:39:06 -07:00
Haritha Chintalapati
fdc5107b5e Merge "msm: camera: sensor: Add error handling when adding request" into camera-kernel.lnx.4.0 2020-07-27 13:38:56 -07:00
Haritha Chintalapati
1eb162cc8f Merge "msm: camera: tfe: Enable TFE and OPE for bengal" into camera-kernel.lnx.4.0 2020-07-27 13:38:20 -07:00
Haritha Chintalapati
79f9e08a6b Merge "msm: camera: csiphy: Fill interrupt size variable" into camera-kernel.lnx.4.0 2020-07-27 13:38:09 -07:00
Haritha Chintalapati
72d728b79b Merge "msm: camera: cci: reset reinit completion on read" into camera-kernel.lnx.4.0 2020-07-27 13:37:54 -07:00
Haritha Chintalapati
9d3a46d91e Merge "msm: camera: jpeg: Add dma driver implementation" into camera-kernel.lnx.4.0 2020-07-27 13:37:45 -07:00
Haritha Chintalapati
82c16fb39a Merge "msm: camera: ife: Optimize the IFE CDM Acquire" into camera-kernel.lnx.4.0 2020-07-27 13:37:12 -07:00
Haritha Chintalapati
b4f8748142 Merge "msm: camera: cci: Fix invalid queue size for cci" into camera-kernel.lnx.4.0 2020-07-27 13:37:01 -07:00
Karthik Anantha Ram
934bb3ea14 msm: camera: ope: Fix unsequenced clang warning
Address unsequenced operations to avoid any undefined behavior.

CRs-Fixed: 2738394
Change-Id: Ieac88c20d1411771d8b722ccb4c417b47570f7ca
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-07-24 17:17:00 -07:00
Karthik Anantha Ram
986223aab6 msm: camera: isp: Remove bubble re-apply recovery mechanism
If a request has been applied the buffer addresses have been
configured, and if a frame bubbles buf done is expected on
the same frame or in the worse case on the next frame.
SW should not try adding a bubbled request back to pending
list without a buf done for that request.

CRs-Fixed: 2729789
Change-Id: I9a2f45c58d39b659cd7a12747dc738c43cf5e0ad
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-07-24 14:01:12 -07:00
Tejas Prajapati
151c426683 msm: camera: sensor: unregister subdev if cpas registration fails
In case if the CPAS registration is failed before freeing the
memory of the subdev, subdev need to be unregistered so that
subdev list entry will not become NULL and other subdev can
be added.

CRs-Fixed: 2708016
Change-Id: I464c73411596fc562fc7a190ddfa130f23ee487a
Signed-off-by: Tejas Prajapati <tpraja@codeaurora.org>
2020-07-24 06:37:50 -07:00
Chandan Kumar Jha
bfa65377f8 msm: camera: common: Add support of PHY TPG deinitialization
Add support of phy tpg deinit in ife HW manager.
Change print statement in shima camera config.

CRs-Fixed: 2732941
Change-Id: I572b19b76afdb89bda4bb1cbad7fd94bb5aa8097
Signed-off-by: Chandan Kumar Jha <cjha@codeaurora.org>
2020-07-24 18:19:42 +05:30
Depeng Shao
ab936609b8 msm: camera: sensor: Only handle the valid request
CRM may give an invalid request id to sensor when the
first req isn't ready, since we don't have chance to
update prev_apply_data in CRM. This change adds a
protection in sensor side to only handle the valid
request for per frame update.

CRs-Fixed: 2738404
Change-Id: Ic43d68a69c10b7b063b40a0cef17e55e748b8b2a
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2020-07-23 23:03:34 +08:00
Trishansh Bhardwaj
97eeefea15 msm: camera: tfe: Enable TFE and OPE for bengal
Enable TFE and OPE compilation for bengal target.

CRs-Fixed: 2729996
Change-Id: I648cae32f39a5bf7225c8be545f1c310e24db8e6
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2020-07-23 05:42:11 -07:00
Tony Lijo Jose
4b9521408e msm: camera: csiphy: add 1.2.5 version phy for holi camera as per hpg
Implement PHY settings as per HPG version File name

CRs-Fixed: 2736884
Change-Id: I01949090448d9f8ff691e40ca38a800dbc15f9d5
Signed-off-by: Tony Lijo Jose <tjose@codeaurora.org>
2020-07-22 22:29:35 -07:00
Ayush Kumar
bef2e958a1 msm: camera: req_mgr: Support for 3 links in CRM
Add third link to support 3 concurrent camera in
sync. This change contain support same max pipeline
delay and different max pipeline delay as well.

CRs-Fixed: 2723787
Change-Id: I25e50e8e9a19c4c306a01dd3b700f8a990f3eb66
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2020-07-23 06:13:58 +05:30
Jigarkumar Zala
c1b6545f00 msm: camera: sensor: Add error handling when adding request
Currently proper error handling is not present in case of failure
in adding request to request manager. This change adding proper
result send out to UMD.

CRs-Fixed: 2738448
Change-Id: I7fb54c085ac670c197523e4d7cb416eeb414a2ed
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2020-07-22 16:46:52 -07:00
Camera Software Integration
8c5f76e807 Merge "msm: camera: reqmgr: Defer probe when master is not ready" into camera-kernel.lnx.4.0 2020-07-22 15:36:34 -07:00
Camera Software Integration
bbbf276f27 Merge "Revert "msm: camera: isp: Disable clk gating in IFE top"" into camera-kernel.lnx.4.0 2020-07-22 15:36:00 -07:00
Camera Software Integration
e4bfc2b00f Merge "msm: camera: isp: Added CSID recovery mechanism" into camera-kernel.lnx.4.0 2020-07-22 15:35:37 -07:00
Jigar Agrawal
3f8fc789d9 msm: camera: ife: Optimize the IFE CDM Acquire
Optimize IFE configuration process by making
IFE hw update entries independent of the hw type
(IFE or SFE). Use CPAS-CDM for dualIFE configuration.

CRs-Fixed: 2704472
Change-Id: I1ecba0312c83f0ab1b88c158430650bb9e28666c
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2020-07-21 17:02:06 -07:00