Commit Graph

235 Commits

Author SHA1 Message Date
Jigarkumar Zala
6131f8a58e msm: camera: config: Enable module based compilation
Currently all the modules are compiled based on single config flag.
This change adds the capability for module based compilation
with module based config flag for various targets.

CRs-Fixed: 2569808
Change-Id: I054a555db04d1643b9da2d3f409d009c1fb2da9c
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2019-12-03 13:03:27 -08:00
Jigarkumar Zala
02ac7654b8 msm: camera: utils: Add stub function for cx_ipeak
Add mandate check in order to compile and use the cx_ipeak
related functionality. Also, update header with stub function.

CRs-Fixed: 2572607
Change-Id: I2e07101f88b6a47ca1733d04b3aa126fdeae176b
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2019-12-03 13:03:27 -08:00
Jong-Guk Im
9d1a4364ae Merge "msm: camera: tfe: Add uapi support to TFE driver" into camera-kernel.lnx.4.0 2019-12-02 18:04:38 -08:00
Jong-Guk Im
541ad78d4b Merge "msm: camera: ope: Add dynamic clock support for OPE" into camera-kernel.lnx.4.0 2019-12-02 18:04:35 -08:00
Jong-Guk Im
a5c8e960c4 Merge "msm: camera: ope: Add uapi support to OPE driver" into camera-kernel.lnx.4.0 2019-12-02 18:04:28 -08:00
Jeyaprakash Soundrapandian
d642611210 Merge "msm: camera: cpas: Add cpas support for camera v580 platform" into camera-kernel.lnx.4.0 2019-12-02 15:52:25 -08:00
Pavan Kumar Chilamkurthi
6b265f1750 msm: camera: tfe: Add uapi support to TFE driver
TFE is thin front end hardware that capture and process the
real time image. Support is added to enable the TFE
hardware.

CRs-Fixed: 2545590
Change-Id: Ie8efef77fabeeea28d70380c398089e6351e35e3
Signed-off-by: Ravikishore Pampana <rpampana@codeaurora.org>
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2019-12-02 15:49:19 -08:00
Suresh Vankadara
02279f7bf6 msm: camera: ope: Add dynamic clock support for OPE
Dynamic clock and bandwidth support is added to
OPE.

CRs-Fixed: 2520602
Change-Id: I4ba4bb3b24e4ef47dea35810564cae69912ef72e
Signed-off-by: Suresh Vankadara <svankada@codeaurora.org>
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2019-12-02 15:49:19 -08:00
Pavan Kumar Chilamkurthi
f5203c1106 msm: camera: ope: Add uapi support to OPE driver
OPE is camera offline engine, support is added
to enable camera OPE hardware.

CRs-Fixed: 2520602
Change-Id: I8b08ecb34323ee927f2be88707ad65ad2444447d
Signed-off-by: Suresh Vankadara <svankada@codeaurora.org>
Signed-off-by: Ravikishore Pampana <rpampana@codeaurora.org>
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2019-12-02 15:49:10 -08:00
Jong-Guk Im
59b5e03e98 Merge "msm: camera: isp: Update camera timestamps to ktime API" into camera-kernel.lnx.4.0 2019-11-27 14:08:52 -08:00
Mukund Madhusudan Atre
9a9e1a93e5 msm: camera: cpas: Add cpas support for camera v580 platform
Add register info. initial QoS settings info to program
camera static settings for chipsets having camera v580.

CRs-Fixed: 2528069
Change-Id: I6361140959ef64f35539612cf66604344adaea52
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2019-11-27 13:53:23 -08:00
Abhijit Trivedi
a15be98002 UPSTREAM: 11/22/19: Merge 'quic/camera-kernel.lnx.1.0' into 'quic/camera-kernel.lnx.4.0'
* quic/camera-kernel.lnx.1.0::
  msm: camera: sensor: Support for read operation
  msm: camera: req_mgr: Fix kmem_cache definition
  msm: camera: custom: Add support for acquire_hw_v1
  msm: camera: core: Prevent crash on kref_put
  msm: camera: isp: csid hw register reset with IRQ
  msm: camera: isp: Reset overflow pending flag in start hw
  msm: camera: icp: Increase MAX_PKT_SIZE_MSGQ for ICP
  msm: camera: icp: icp debug improvement
  msm: camera: reqmgr: Improve master slave sync
  msm: camera: isp: Notify CRM to pause SOF timer after flush
  msm: camera: csiphy: Fix csiphy v1.2 skew calibration settings
  msm: camera: csiphy: Update reset sequence for csiphy v1.2
  msm: camera: csiphy: Update registers for CSIPHY v1.2
  msm: camera: reqmgr: Change v4l2 notify error log type
  msm: camera: isp: Set device enable flag after enable csid hardware

Change-Id: I52c682b36583436425d157c8927e6fbcf5bf32eb
Signed-off-by: Abhijit Trivedi <abhijitt@codeaurora.org>
2019-11-22 17:42:17 -08:00
Karthik Jayakumar
8481d870a0 msm: camera: isp: Update camera timestamps to ktime API
Old API's returning struct timeval and struct timespec will be
deprecated in future kernel versions as their tv_sec members
will overflow in the year 2038 on 32-bit arhitectures.

CRs-Fixed: 2564616
Change-Id: I6e3e37cf957daca992b66cad1134f49dd78961f5
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2019-11-22 15:51:37 -08:00
Sureshnaidu Laveti
50e83233ad msm: camera: sensor: Support for read operation
Supporting read operation for sensor and
sub modules OIS and actuator.

CRs-Fixed: 2538801
Change-Id: I83ad154dd577d5a664c4d68792a90489e725fbfd
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
Signed-off-by: Sureshnaidu Laveti <lsuresh@codeaurora.org>
2019-11-20 14:53:14 -08:00
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
Abhijit Trivedi
9b6110b579 UPSTREAM: 11/12/19: Merge 'quic/camera-kernel.lnx.1.0' into 'quic/camera-kernel.lnx.4.0'
* quic/camera-kernel.lnx.1.0:
  msm: camera: common: Update uapi to support custom hw features
  msm: camera: ife: calculate accurate boot timestamp at CSID SOF
  msm: camera: cpas: Update ife_rd safe lut value
  msm: camera: sensor: Remove true/false redefinitions
  msm: camera: reqmgr: Add support to modify timer for long exposure
  msm: camera: reqmgr: Add provision to obtain exposure time
  msm: camera: cpas: Fix TCSR Register programming
  msm: camera: cci: Fix cam_cci_get_subdev for conditional compilation
  msm: camera: utils: Remove deprecated clk_set_flag functions
  msm: camera: csiphy: Update DPHY combo mode sequence
  msm: camera: csiphy: Correct Dphy mission mode sequence
  msm: camera: core: Fix extraneous variable declaration
  msm: camera: icp: Remove qcom soc dependency
  msm: camera: sync: Dump fence info in case of fence exhaust
  msm: camera: icp: Use CAM_PERF for clock, bw related logs
  msm: camera: common: va_end should follow va_start
  msm: camera: common: Fix integer overflow in shift
  msm: camera: reqmgr: Remove division on uint64_t
  msm: camera: isp: Improve isp substate logging
  msm: camera: isp: Limit sof_in_epoch log to first frame
  msm: camera: jpeg: Add plane stride & slice height debug info
  msm: camera: isp: Change state immediately in flush
  msm: camera: isp: Dump isp req for cdm timeout
  msm: camera: ife: Add packing format support
  msm: camera: icp: Fix AHB, AXI voting in icp
  msm: camera: ife: Remove duplicate add to port counters
  msm: camera: csiphy: Update CPHY 3-phase registers for CSIPHY v1.2

Change-Id: I93948d5cfcf2c8dea921d34696456490abd6f1e5
Signed-off-by: Abhijit Trivedi <abhijitt@codeaurora.org>
2019-11-12 12:51:34 -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
Karthik Jayakumar
524b1ab1d4 msm: camera: config: Makefile fixes to support legacy kernel build system
Adds fixes to makefile in order to support legacy kernel build systems.

CRs-Fixed: 2560543
Change-Id: Iab571871e5171aab501c41496cc09e3c5d942985
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2019-11-06 13:26:57 -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