Commit Graph

217 Commits

Author SHA1 Message Date
Karthik Jayakumar
dd1ac7b717 msm: camera: req_mgr: Fix kmem_cache definition
Add fixes to cam_req_mgr to include kmem_cache struct
definitions.

CRs-Fixed: 2554484
Change-Id: I368aa32e085431eff1976dfc09929e730d63b405
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2019-11-20 14:50:23 -08:00
Karthik Anantha Ram
a27592f01b msm: camera: custom: Add support for acquire_hw_v1
Split the acquire in custom node to acquire device and
acquire hw to be in line with IFE for multicamera usecases.

CRs-Fixed: 2524308
Change-Id: I7be7d5227dcd304d095d7e3d7fac32800fecc199
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2019-11-20 14:49:25 -08:00
Trishansh Bhardwaj
5f530223ba msm: camera: core: Prevent crash on kref_put
kref_put causes crash if refcount is zero.
This change prevents crash by checking if refcount value.

CRs-Fixed: 2553290
Change-Id: Ie9a950b289cdb2b8fca8c5d025be540d926eadbd
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2019-11-20 14:46:28 -08:00
Tejas Prajapati
809c56ef16 msm: camera: isp: csid hw register reset with IRQ
CSID hw register reset is done with the the help of
IRQ to make sure it is reset every time before we start
a new session.

CRs-Fixed: 2563958
Change-Id: I33c870003eb1e99d458b7650b5b3218f61cccd3b
Signed-off-by: Tejas Prajapati <tpraja@codeaurora.org>
2019-11-20 14:41:53 -08:00
Pavan Kumar Chilamkurthi
2c2fea11c5 msm: camera: isp: Reset overflow pending flag in start hw
While start hw, either a fresh start or resume after flush,
reset the overflow pending flag as we reset the hw and start
fresh with applying init packet. In case where overflow happening
at the same time as halt immediately, we set overflow pending
flag to true. Eventhough while halt immediate and resume
scenario, we reset the hw, not resetting overflow pending flag
causes not to apply any new packets while resume.

CRs-Fixed: 2565049
Change-Id: Ia9c871402343306945fe1b8f8373659e52630fe2
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2019-11-19 17:54:38 -08:00
Trishansh Bhardwaj
09c9b6c054 msm: camera: icp: Increase MAX_PKT_SIZE_MSGQ for ICP
Increase ICP_HFI_MAX_PKT_SIZE_MSGQ_IN_WORDS to improve workqueue
delay tolerance.

CRs-Fixed: 2564981
Change-Id: Ic61e79588a834e651e7b2f5e44acd3fcbc9d8f77
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2019-11-19 17:53:27 -08:00
Tejas Prajapati
a3b0bbaa8c msm: camera: icp: icp debug improvement
ON receiving HFI_EVENT_SYS_ERROR event_id as part
of sys_error msg and event_data1 is set to
HFI_ERR_SYS_FATAL, trigger the crash.

CRs-Fixed: 2549369
Change-Id: Iddf56f46b2c07a703a787b0dedebd801081c93d6
Signed-off-by: Tejas Prajapati <tpraja@codeaurora.org>
2019-11-19 17:52:21 -08:00
Trishansh Bhardwaj
1f409d4bca msm: camera: reqmgr: Improve master slave sync
If link is not ready on master epoch, but it becomes ready on slave
epoch, then master skips apply and slave applies request and goes ahead
of master.
Fix this by skipping apply on slave if master slot in not in applied
state.

CRs-Fixed: 2562008
Change-Id: Ic612eedfeedf2a6ea50737a49a6f1f31a5de1dc2
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2019-11-16 18:02:04 +05:30
Camera Software Integration
f697ab3bb5 Merge "msm: camera: isp: Notify CRM to pause SOF timer after flush" into camera-kernel.lnx.1.0 2019-11-15 05:46:08 -08:00
Camera Software Integration
df8adb4c3c Merge "msm: camera: csiphy: Fix csiphy v1.2 skew calibration settings" into camera-kernel.lnx.1.0 2019-11-15 05:45:50 -08:00
Camera Software Integration
d85e275feb Merge "msm: camera: isp: Set device enable flag after enable csid hardware" into camera-kernel.lnx.1.0 2019-11-15 05:44:35 -08:00
Chandan Kumar Jha
fc8ddd752d msm: camera: isp: Notify CRM to pause SOF timer after flush
Adding CRM interface to stop SOF timer from isp during flush.
During flush hardware is getting stop and will not send SOF
notification to CRM so need to pause SOF timer. Whenever SOF
timer will get expire,do not need to send error to UMD during
pause time.

CRs-Fixed: 2564389
Change-Id: I6d85f2c658c30dbe211f0ec9d83bca323a5c265b
Signed-off-by: Chandan Kumar Jha <cjha@codeaurora.org>
2019-11-14 08:06:56 -08:00
Shravan Nevatia
313a84b808 msm: camera: csiphy: Fix csiphy v1.2 skew calibration settings
Correct the skew calibration register settings
in the DPHY sequence for csiphy v1.2.

CRs-Fixed: 2563037
Change-Id: Idd97600b66dd00ff67db902dbd9d649aa005b4ec
Signed-off-by: Shravan Nevatia <snevatia@codeaurora.org>
2019-11-14 03:39:07 -08:00
Camera Software Integration
f123cac5fc Merge "msm: camera: csiphy: Update reset sequence for csiphy v1.2" into camera-kernel.lnx.1.0 2019-11-13 05:45:32 -08:00
Camera Software Integration
09d233978c Merge "msm: camera: csiphy: Update registers for CSIPHY v1.2" into camera-kernel.lnx.1.0 2019-11-13 05:45:23 -08:00
Camera Software Integration
4d054a6539 Merge "msm: camera: reqmgr: Change v4l2 notify error log type" into camera-kernel.lnx.1.0 2019-11-13 05:44:43 -08:00
Camera Software Integration
f45e3dda5c Merge "msm: camera: utils: Remove deprecated clk_set_flag functions" into camera-kernel.lnx.1.0 2019-11-12 05:43:33 -08:00
Camera Software Integration
59f2100a95 Merge "msm: camera: cci: Fix cam_cci_get_subdev for conditional compilation" into camera-kernel.lnx.1.0 2019-11-12 05:43:21 -08:00
Camera Software Integration
79ba868415 Merge "msm: camera: sensor: Remove true/false redefinitions" into camera-kernel.lnx.1.0 2019-11-12 05:42:59 -08:00
Camera Software Integration
cbeb8f96a9 Merge "msm: camera: cpas: Update ife_rd safe lut value" into camera-kernel.lnx.1.0 2019-11-12 05:42:51 -08:00
Shravan Nevatia
97c65b5ff3 msm: camera: csiphy: Update reset sequence for csiphy v1.2
Add a transition of 1 to 0 in the PHY reset register
during the PHY reset sequence to fix UNBOUNDED_FRAME
errors for CPHY sensor.

CRs-Fixed: 2563019
Change-Id: I019e4cfdfa2042416e62b306dca0448d6a05c3b8
Signed-off-by: Shravan Nevatia <snevatia@codeaurora.org>
2019-11-11 22:42:19 +05:30
Shravan Nevatia
8acdfccd85 msm: camera: csiphy: Update registers for CSIPHY v1.2
Update register settings for CPHY/DPHY/combo DPHY
modes as per the latest HPG (revision J).

CRs-Fixed: 2563037
Change-Id: I137141a490bedce4632991e5eb12887d0c9fa30e
Signed-off-by: Shravan Nevatia <snevatia@codeaurora.org>
2019-11-11 07:03:47 -08:00
Camera Software Integration
5683e9c100 Merge "msm: camera: ife: calculate accurate boot timestamp at CSID SOF" into camera-kernel.lnx.1.0 2019-11-11 06:48:23 -08:00
Karthik Anantha Ram
7583d45a07 msm: camera: reqmgr: Change v4l2 notify error log type
In case userspace fails to dequeue a v4l2 event with a
valid request, kernel will dump that message as error and
rest will be rate limited.

CRs-Fixed: 2558548
Change-Id: I1c6769f47d0e1ca4a3ce5c6467f6c280104ae2b8
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2019-11-08 10:58:13 -08:00
Karthik Anantha Ram
fdd212fdf3 msm: camera: common: Update uapi to support custom hw features
This change provides provision to propagate frame id to
userspace as part of shutter notification. The change also
add new acquire params for IFE when custom HW is in the pipeline.

CRs-Fixed: 2524308
Change-Id: Ia6f6efb1edc6e6a01d7b37aeb2787b1e98d8f81e
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2019-11-08 10:57:54 -08:00
Alok Pandey
69c67ebc90 msm: camera: ife: calculate accurate boot timestamp at CSID SOF
The boot timestamp is calculated in tasklet context. Due to system
performance and scheduling delay, it may vary. It is somtimes causing
failure for few time bound test cases.
To handle above problem, This change also considers qtime difference
to calculate accurate boot time at CSID each SOF.

CRs-Fixed: 2557758
Change-Id: I36b21a0f2c12cc1c83c209ab01ea90c0ac226995
Signed-off-by: Alok Pandey <akumarpa@codeaurora.org>
2019-11-07 21:32:19 -08:00
Pavan Kumar Chilamkurthi
4e13a0294d msm: camera: cpas: Update ife_rd safe lut value
Do not set safe_lut value for ife_rd path, default
values is good as per recommendation.

CRs-Fixed: 2561696
Change-Id: Icce19f7814329d2e96e94d18096aa12069626429
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2019-11-07 19:35:51 -08:00
Karthik Jayakumar
fd1db0292d msm: camera: sensor: Remove true/false redefinitions
Remove defines in header files that redefine true and false.

CRs-Fixed: 2556282
Change-Id: Ibf87f35efd403faa05e72b070dcfca59e0196a29
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2019-11-06 15:59:34 -08:00
Camera Software Integration
22c15f22e1 Merge "msm: camera: common: Fix integer overflow in shift" into camera-kernel.lnx.1.0 2019-11-06 07:07:52 -08:00
Camera Software Integration
62977f2492 Merge "msm: camera: sync: Dump fence info in case of fence exhaust" into camera-kernel.lnx.1.0 2019-11-06 07:07:36 -08:00
Camera Software Integration
3a95b6ed59 Merge "msm: camera: core: Fix extraneous variable declaration" into camera-kernel.lnx.1.0 2019-11-06 07:07:21 -08:00
Camera Software Integration
72858b5ccb Merge "msm: camera: common: va_end should follow va_start" into camera-kernel.lnx.1.0 2019-11-06 07:06:55 -08:00
Camera Software Integration
c7c5cbb068 Merge "msm: camera: icp: Remove qcom soc dependency" into camera-kernel.lnx.1.0 2019-11-06 07:06:43 -08:00
Mukund Madhusudan Atre
a6c3698b1f msm: camera: reqmgr: Add support to modify timer for long exposure
In case of long exposure shots, watchdog timer needs to be modified
according to the requested value to avoid trigger. Add support for
modifying timer value and changing it back to normal.

CRs-Fixed: 2530691
Change-Id: I97bdd92d2ed461066bbf746bc6293094a444f8a5
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2019-11-05 13:17:52 -08:00
Karthik Anantha Ram
17ea11cdec msm: camera: reqmgr: Add provision to obtain exposure time
Currently CRM watchdog timer expiry is fixed at 1 second.
This will not hold good if the sensor exposure time is increased
beyond 1 second. In such situations obtain the time from userspace,
and modify the CRM watchdog timer accordingly.

CRs-Fixed: 2530691
Change-Id: I6251bcb2b915a9e317caffd350220e249214c8b2
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2019-11-05 13:16:54 -08:00
Mangalaram ARCHANA
e2085ffb7f msm: camera: cpas: Fix TCSR Register programming
Fix TCSR Register programming to enable SAT.

CRs-Fixed: 2553475
Change-Id: Iaeae7cd06dcbccaa8bf1f98657efff734d048b9f
Signed-off-by: Mangalaram ARCHANA <mangar@codeaurora.org>
2019-11-05 13:15:00 -08:00
Karthik Jayakumar
b46dcb39c4 msm: camera: cci: Fix cam_cci_get_subdev for conditional compilation
Fixes cci_get_subdev to return NULL or computed value depending on
camera driver configuration.

CRs-Fixed: 2554484
Change-Id: I79933ddf28e2c0d23739308b57b5b40d3b56d78e
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2019-11-05 12:18:13 -08:00
Karthik Jayakumar
c1054611fd msm: camera: utils: Remove deprecated clk_set_flag functions
Removed unused functions that called clk_set_flag, which has been
deprecated in linux kernel 5.x.

CRs-Fixed: 2554484
Change-Id: I0062383b0b059e6b359229f4b33470713289abb4
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2019-11-05 12:09:24 -08:00
Jigarkumar Zala
335b376e21 msm: camera: csiphy: Update DPHY combo mode sequence
DPHY combo mode bring up sequence is missing with some
important register settings. Correct and update required
register setting to bringup DPHY combo mode.

CRs-Fixed: 2545921
Change-Id: I1dfb71f1775aa6d6b1173a7de7f14ce74eac08e1
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2019-11-01 16:22:07 -07:00
Jigarkumar Zala
93a5aef818 msm: camera: csiphy: Correct Dphy mission mode sequence
DPHY mission mode sequence is not full functional for
mission mode. Correct and add mandate register settings
for the bringup of DPHY mission mode.

CRs-Fixed: 2545921
Change-Id: Ia1bbf496c5aa993cf0e404c81f7b69b7b889c6f1
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2019-11-01 16:20:15 -07:00
Karthik Jayakumar
15feb22bdd msm: camera: core: Fix extraneous variable declaration
Remove an extra variable declaration within a for loop.

CRs-Fixed: 2554484
Change-Id: I89885eeb8f89893ad7054d54a694a040e4c0bfbb
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2019-11-01 14:59:59 -07:00
Karthik Jayakumar
632c43cf64 msm: camera: icp: Remove qcom soc dependency
Remove soc_info from icp driver as it was unused.

CRs-Fixed: 2557184
Change-Id: I7b85768502f825753ea4b9650b5c3f9df67643fb
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2019-10-31 14:53:45 -07:00
Karthik Jayakumar
2a7ffe9697 msm: camera: sync: Dump fence info in case of fence exhaust
Add error message in case of fence exhaust.
Add support to dump fence table in case of fence exhaust.

CRs-Fixed: 2556458
Change-Id: I9910a04c69b54fe99541524b6581fa9994fd523f
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2019-10-31 14:19:17 -07:00
Pavan Kumar Chilamkurthi
a293b9bfe6 msm: camera: icp: Use CAM_PERF for clock, bw related logs
Use CAM_PERF logging group while printing logs related
to clock, bandwidth updates.

CRs-Fixed: 2523062
Change-Id: Icaa912ae308c307d55e318c0861850093d0ee456
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2019-10-31 13:35:48 -07:00
Trishansh Bhardwaj
bef4415dc8 msm: camera: common: va_end should follow va_start
Each  invocation  of  va_start() must be matched by a corresponding
invocation of va_end() in the same function.

CRs-Fixed: 2549155
Change-Id: I6a3214ce863c4af0425d061184cfa44682f89545
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2019-10-31 01:29:19 -07:00
Trishansh Bhardwaj
30b9eed071 msm: camera: common: Fix integer overflow in shift
Various drivers are using right shift  by 32 to check if dma address is
32 bit addressable. This will result in shift count overflow in 32 bit
arch.

CRs-Fixed: 2543730
Change-Id: I57e30bc9c0a8179c8d74f3bd3b6567bdfff60741
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2019-10-31 10:45:40 +05:30
Trishansh Bhardwaj
4e9f21ee27 msm: camera: reqmgr: Remove division on uint64_t
Arm arch does not support dividing 64 bit integer, replacing it with
do_div call.

CRs-Fixed: 2543730
Change-Id: I86f8c706d20978b4c7bfd78c499dacb482c4d37a
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2019-10-30 13:42:25 -07:00
Ravikishore Pampana
d1469c8f6a msm: camera: isp: Set device enable flag after enable csid hardware
Device enable flag is getting set after configuring the CSID csi rx
and csid path configuration. If irq comes after configuring the csi rx
hardware then irq handler is not handling as it is checking the device
enable flag. So set device enable flag after enabling the hardware.

CRs-Fixed: 2541840
Change-Id: I022b6dccef4153c34bc8cf99e7a18e2978f92d3f
Signed-off-by: Ravikishore Pampana <rpampana@codeaurora.org>
2019-10-30 14:44:10 +05:30
Pavan Kumar Chilamkurthi
09e2bdc6bf msm: camera: isp: Improve isp substate logging
Improve sp substate logging to print state string
instead of value. Add handler for reg_update in
bubble state to print a warning log indicate the
event.

CRs-Fixed: 2523062
Change-Id: I95c6f16733a177cbf33099775d8ef7eb049a62b4
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2019-10-28 13:31:25 -07:00
Venkat Chinta
c23b668890 msm: camera: isp: Limit sof_in_epoch log to first frame
This change limits SOF in early PCR log to the first
frame for that context. This log is needed to catch
unexpected reg updates on first frame after stream on.

CRs-Fixed: 2553728
Change-Id: Icad85aeab2b095a6b95889c933a2de34acebed80
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
Signed-off-by: Vishalsingh Hajeri <vhajeri@codeaurora.org>
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2019-10-28 11:39:27 -07:00