Commit Graph

826 Commits

Author SHA1 Message Date
Camera Software Integration
fb8c7dbeb3 Merge "msm: camera: common: Enable debugfs compile check" into camera-kernel.lnx.4.0 2020-07-07 17:55:41 -07:00
Camera Software Integration
071907ecf0 Merge "msm: camera: common: Add hw version checks for shima camera" into camera-kernel.lnx.4.0 2020-07-02 17:46:36 -07:00
Camera Software Integration
840bfd5e6c Merge "msm: camera: cpas: Add support for shima camnoc" into camera-kernel.lnx.4.0 2020-07-02 17:46:25 -07:00
Camera Software Integration
cbd7f1bc3e Merge "msm: camera: core: Handle request abort and signal fence CANCEL" into camera-kernel.lnx.4.0 2020-07-02 17:46:10 -07:00
Camera Software Integration
772039c6d8 Merge "msm: camera: cci: Correct the condition check" into camera-kernel.lnx.4.0 2020-07-02 17:45:37 -07:00
Camera Software Integration
0a20494ef7 Merge "msm: camera: custom: Enable driver compilation & minor fixes" into camera-kernel.lnx.4.0 2020-07-02 17:44:44 -07:00
Camera Software Integration
ac0deb5b99 Merge "msm: camera: reqmgr: Skip wd timer update if there is no valid request" into camera-kernel.lnx.4.0 2020-07-02 17:44:32 -07:00
Karthik Anantha Ram
cb24ba9b79 msm: camera: common: Return appropriate error code for cancelled requests
If a request is submitted post flush and the request ID of that
request is <= last flush req ID return an appropriate error code
to indicate the same.

CRs-Fixed: 2720555
Change-Id: Ic26c4fc5f0ba490ed277b3bb301cc02d1fa027d6
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-07-02 10:54:15 -07:00
Depeng Shao
006e454f56 msm: camera: isp: Only RDI path can access RDI resource
Only RDI path can access RDI resource.

CRs-Fixed: 2721399
Change-Id: Iad15b72a12cf825f150605f110bee04880a65852
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2020-07-02 19:53:42 +08:00
Jigar Agrawal
f3435b0efd msm: camera: ife: Improve IFE logs for better debugging
Add HW index in Release, Acquire, Flush and confiqure
IFE Logs to Improve the debugging.

CRs-Fixed: 2709537
Change-Id: Ia540f1498d889f1e744e6ab20e07d17e27b07731
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2020-07-01 14:08:10 -07:00
Karthik Jayakumar
7c8204a42d msm: camera: common: Enable debugfs compile check
Guards debugfs features in camera driver to only be compiled when
CONFIG_DEBUG_FS is enabled.

CRs-Fixed: 2717236
Change-Id: I0de77741301d259cbec64e8a2e27830981b2b69d
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2020-07-01 10:59:24 -07:00
Camera Software Integration
cd3fb3812a Merge "msm: camera: csiphy: Enable CSIPHY v1.2.4 in PHY driver" into camera-kernel.lnx.4.0 2020-06-30 13:39:28 -07:00
Mukund Madhusudan Atre
d543187b79 msm: camera: utils: Add final BW vote logs as perf logs
AHB and AXI BW voting path requires all key logs to be perf.
Change BW voting logs in utils to perf for easier debugging.

CRs-Fixed: 2584631
Change-Id: I41ef094f6633101bb7b636ea310aca81de0101c7
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-06-30 10:10:52 -07:00
Jigarkumar Zala
fa08068801 msm: camera: csiphy: Update logic for lane enablement
Currently lane enablement is happening as a part of lanemask
field, which is send by UMD. Lane enablement should be purely
depends on laneCnt and laneAssign attributes. Also, combo mode
sensors needs to come with combo mode flag set from the UMD.
This change updates the logic for lane enablement with respect
to laneAssign and laneCnt, and also covers all combomode selection
as per the request. This change also enables the sensors to acquire
and streamon/streamoff at anytime in session.

CRs-Fixed: 2677450
Change-Id: I4f0d3ffd7245a931c273611c9c4b7e503c038664
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2020-06-29 15:56:53 -07:00
Jigarkumar Zala
c8ac83dc3e msm: camera: cci: Correct the condition check
Submodules per master uninitialize check needs to be set to false
when all submodules are released for that master. Correct the
refcount check for the appropriate operation.

CRs-Fixed: 2686487
Change-Id: Iaea94e4d1ad83bef99d40cec4e96de3993783ec1
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2020-06-29 11:10:02 -07:00
Chandan Kumar Jha
25e54e279c msm: camera: common: Add hw version checks for shima camera
Add hw version checks in csid, vfe and ICP driver.

CRs-Fixed: 2707213
Change-Id: I9a698479b5a86b279a4a58cceb908ed7a7e93f11
Signed-off-by: Chandan Kumar Jha <cjha@codeaurora.org>
2020-06-29 19:44:04 +05:30
Chandan Kumar Jha
899a6b0d50 msm: camera: cpas: Add support for shima camnoc
Add register information. Initial QoS settings info to program
camera static settings for chipsets having camera V570_200.

CRs-Fixed: 2707213
Change-Id: Ic9af3c4ff1cc69c6b70e1489e4634afe7b71390a
Signed-off-by: Chandan Kumar Jha <cjha@codeaurora.org>
2020-06-29 19:43:09 +05:30
Pavan Kumar Chilamkurthi
e618f72d9f msm: camera: core: Handle request abort and signal fence CANCEL
Handle request abort cases from underlying hw mgr, hw layers.
This will handle in differentiating ERROR vs ABORT returned
from firmware in case of ICP and signal the fence accordingly.
By the time flush is issued to firmware, if a request is not
yet processed, firmware signals with Abort, which needs to be
propogated as CANCEL instead of ERROR to core context layer
so that context layer signals the fence accordingly as
ERROR or CANCEL.

CRs-Fixed: 2702771
Change-Id: I8fe6bd1c8f5cf09b99196a1caac1283032418f8c
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2020-06-29 02:38:06 -07:00
Fernando Pacheco
aaf3059502 msm: camera: cci: Fix incorrect use of cci config ioctl
The cci configuration will be transitioned to a new API that does not
require routing through the v4l layer. This is work-in-progrss so in
the mean time prevent the device from being exposed as configurable
from userspace.

The ioctl will still be exposed to kernel users so fix the arg size
as well. We want size of struct not pointer.

CRs-Fixed: 2702760
Change-Id: I9c7bd8f76980603dbf27e1c5bc9b19f8a3b8a39a
Signed-off-by: Fernando Pacheco <fpacheco@codeaurora.org>
2020-06-26 14:21:20 -07:00
Karthik Anantha Ram
7a99d64ebf msm: camera: reqmgr: Skip wd timer update if there is no valid request
At a given point if there is no request to apply, carry forward
the same timeout value for the wd timer. Modify timer only in
cases where we apply a valid request.

CRs-Fixed: 2698225
Change-Id: I92a1f1c6d0154349e19fdc1582d9d8836a7db1f4
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-06-26 10:23:22 -07:00
Camera Software Integration
b4f16aace6 Merge "msm: camera: isp: Reset offline context flag" into camera-kernel.lnx.4.0 2020-06-24 20:06:58 -07:00
Camera Software Integration
fd253633e1 Merge "msm: camera: common: Update holi camera workq wrapper" into camera-kernel.lnx.4.0 2020-06-24 18:03:53 -07:00
Shravan Nevatia
14ed8a149e msm: camera: csiphy: Enable CSIPHY v1.2.4 in PHY driver
Add support for CSIPHY v1.2.4 in the PHY driver.

CRs-Fixed: 2709344
Change-Id: Ic0eeabe2e978e6f2513e61a063e8b354c8466954
Signed-off-by: Shravan Nevatia <snevatia@codeaurora.org>
2020-06-24 19:53:38 +05:30
zhuo
124ac14bf9 msm: camera: isp: Reset offline context flag
This change resets the offline context flag,
otherwise the packet may be applied to HW immediately
if this context is offline context last time.

CRs-Fixed: 2696977
Change-Id: I2fc836f7ba2889ec62273c3b12cc4050736f587b
Signed-off-by: zhuo <zhuo@codeaurora.org>
2020-06-23 12:04:49 -07:00
Suresh Vankadara
c92348064f msm: camera: common: Update holi camera workq wrapper
Update OPE and TFE drivers to use new camera workq
wrapper functions.

CRs-Fixed: 2716498
Change-Id: I05ecefb191a544c2953ac7e71a7c9a95d1f1fb10
Signed-off-by: Suresh Vankadara <svankada@codeaurora.org>
2020-06-23 10:51:59 +05:30
Karthik Anantha Ram
139ced0c94 msm: camera: custom: Enable driver compilation & minor fixes
Enable custom driver compilation on lahaina and few minor fixes
in custom HW driver.

CRs-Fixed: 2716300
Change-Id: I6f9ead5d2d67d91c14daf200ba12e95a1afec61d
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-06-22 16:17:12 -07:00
Camera Software Integration
8e44ef7540 Merge "msm: camera: req_mgr: Clean up debugfs entry" into camera-kernel.lnx.4.0 2020-06-22 13:30:43 -07:00
Camera Software Integration
ac03dc0e7c Merge "msm: camera: cdm: Add CDM cmd_type WAIT in dump util" into camera-kernel.lnx.4.0 2020-06-22 13:30:32 -07:00
Camera Software Integration
b1dddc76ef Merge "msm: camera: isp: Bring PPI driver in camera techpack" into camera-kernel.lnx.4.0 2020-06-22 13:30:14 -07:00
Camera Software Integration
118bf8e59f Merge "msm: camera: utils: Add logic to maintain unique buffer handle for patch" into camera-kernel.lnx.4.0 2020-06-19 17:29:40 -07:00
Camera Software Integration
9ff96e5949 Merge "msm: camera: cci: Add check for the cci master initialization" into camera-kernel.lnx.4.0 2020-06-19 17:29:26 -07:00
Camera Software Integration
d16dedda9e Merge "msm: camera: csid: Add CSID Number in CSID ISR Logs" into camera-kernel.lnx.4.0 2020-06-18 17:21:49 -07:00
Camera Software Integration
f6347f6e3a Merge "msm: camera: sensor: Dump phy registers on error" into camera-kernel.lnx.4.0 2020-06-18 17:21:06 -07:00
Camera Software Integration
6a1d514519 Merge "msm: camera: cdm: Add priority group support" into camera-kernel.lnx.4.0 2020-06-18 17:20:51 -07:00
Camera Software Integration
792f40e576 Merge "msm: camera: isp: Correct the bitmask for packet header" into camera-kernel.lnx.4.0 2020-06-18 17:20:22 -07:00
Camera Software Integration
3f28f49226 Merge "msm: camera: isp: validate in_port before accessing" into camera-kernel.lnx.4.0 2020-06-18 17:20:07 -07:00
Camera Software Integration
811d02c493 Merge "msm: camera: isp: Enable format measurement in CSID" into camera-kernel.lnx.4.0 2020-06-18 17:19:48 -07:00
Camera Software Integration
19763e6bff Merge "msm: camera: cpas: Add support for holi camnoc" into camera-kernel.lnx.4.0 2020-06-18 17:19:29 -07:00
Camera Software Integration
afe7750406 Merge "msm: camera: ife: Add support for csitpg 1.3" into camera-kernel.lnx.4.0 2020-06-18 17:19:19 -07:00
Camera Software Integration
5d4113257c Merge "msm: camera: smmu: Enhance debug capability for camera memmgr" into camera-kernel.lnx.4.0 2020-06-18 17:19:03 -07:00
Camera Software Integration
ed2f9c224c Merge "msm: camera: mem_mgr: Cache invalidation optimization" into camera-kernel.lnx.4.0 2020-06-18 17:17:42 -07:00
Camera Software Integration
235a9117e6 Merge "msm: camera: reqmgr: Work queue names added" into camera-kernel.lnx.4.0 2020-06-18 17:17:27 -07:00
Camera Software Integration
e5cd58fbb6 Merge "msm: camera: utils: add spacing between register values" into camera-kernel.lnx.4.0 2020-06-18 17:17:09 -07:00
Trishansh Bhardwaj
e625f33cff msm: camera: isp: Bring PPI driver in camera techpack
This change bring PPI driver from msm-4.14 to camera-kernel.lnx.4.0.
msm: camera: isp: Added PPI driver functionality
msm: camera: ppi: Change PPI reset sequence
msm: camera: isp: Do not enable the ppi hw twice.

CRs-Fixed: 2682747
Change-Id: I7cde3aeed1dbcef95f25441c2482f5bc8c1534de
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2020-06-19 00:37:59 +05:30
Jigarkumar Zala
5a5fb4e8f0 msm: camera: req_mgr: Clean up debugfs entry
At the time of unbind, all debugfs entry needs to be properly
clean up. This change adds debugfs directory removal alongwith
entries under debugfs root entry.

CRs-Fixed: 2675526
Change-Id: I3eba11db032dbafe5f7d444e8c5a823639ba0e74
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2020-06-17 13:54:11 -07:00
Jigarkumar Zala
becd9f4f11 msm: camera: cci: Add check for the cci master initialization
Multiple Sensor submodules can stream on same CCI master. Currently,
there is not any knowledge, whether requested master is already
initialized by other submodules. This can result in operation slave
in error, while other submodule tries to init the same master.
This change adds the boolean variable to notify cci hardware, whether
master is already initialized, and do the operations accordingly.

CRs-Fixed: 2686487
Change-Id: I8b5d01fc9fd06176e9fbd9a69d56424d4ef79a73
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2020-06-17 10:33:06 -07:00
Jigarkumar Zala
968d954b75 msm: camera: utils: Add logic to maintain unique buffer handle for patch
Currently smmu_get_iova is called for every patch, regardless of the same
source handle. This change avoids this by checking if io virtual address
is already being quried with earlier patch. This can reduce the call and
mutex operation from smmu prospective.

CRs-Fixed: 2711810
Change-Id: I681589cd1328389e0828a3318edad1a2a91d8547
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2020-06-16 13:20:13 -07:00
Jigar Agrawal
1268c5ae40 msm: camera: csid: Add CSID Number in CSID ISR Logs
Add CSID Number for RDI and UDI paths in CSID ISR
for better debugging purpose.

CRs-Fixed: 2709537
Change-Id: Ie8e70addaa282a07feb38597dba9a3abdec77707
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2020-06-15 11:17:27 -07:00
Camera Software Integration
f860d9fb11 Merge "msm: camera: reqmgr: Modify SOF watchlog timer for INIT exposure" into camera-kernel.lnx.4.0 2020-06-12 13:26:24 -07:00
Camera Software Integration
74594a12c7 Merge "msm: camera: reqmgr: Add provision in UAPI for INIT exp timeout" into camera-kernel.lnx.4.0 2020-06-12 13:26:11 -07:00