Граф коммитов

250 Коммитов

Автор SHA1 Сообщение Дата
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
Karthik Jayakumar cb1341b56b msm: camera: jpeg: Add plane stride & slice height debug info
Add plane stride and slice height to debug info for verifying
JPEG buffer configuration.

CRs-Fixed: 2542420
Change-Id: I67fbb0a0da9104b4f9c412a558b62149abb8aec9
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2019-10-25 13:07:58 -07:00
Venkat Chinta 04cf1dd4ae msm: camera: isp: Change state immediately in flush
This commit changes the isp context state to flushed state
immediately in order to ignore any further IRQs from the HW.

CRs-Fixed: 2546941
Change-Id: I47f4999a3f51b581697e8dbfd07ef1539b478766
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2019-10-23 15:50:23 -07:00
Vishalsingh Hajeri efffa6d11a msm: camera: isp: Dump isp req for cdm timeout
Print out CDM command buffers to check for invalid
command entry.

CRs-Fixed: 2549972
Change-Id: I5998e62e4ba72fa67394ddf92a4680bc1c909597
Signed-off-by: Vishalsingh Hajeri <vhajeri@codeaurora.org>
2019-10-23 15:48:50 -07:00
Trishansh Bhardwaj 1fdbf849b9 msm: camera: ife: Add packing format support
This change adds packing format field for CSID in IFE Lite for
version 17x hardware.

CRs-Fixed: 2547147
Change-Id: Ib6b8331af6a425314a507e18486c1fffd819007a
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2019-10-23 15:47:52 -07:00
Pavan Kumar Chilamkurthi 69fc708d01 msm: camera: icp: Fix AHB, AXI voting in icp
Due to a mismatched internal structure num_paths for
AXI voting is always set to 0 for ipe, bps which is
causing not to vote any AXI bandwidth for these hws.
After all contexts associated with a device go to
inactive state, reduce the AHB vote to minimum value
to make sure previously voted high AHB vote doesn't
remain for the rest of camera session.

CRs-Fixed: 2546088
Change-Id: I7621bb85280b2541ed37a87c9e486dd6be62ea24
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2019-10-23 15:47:04 -07:00
Venkat Chinta ec8b26eda2 msm: camera: ife: Remove duplicate add to port counters
This change removes duplicate add to port counters during
IFE acquire.

CRs-Fixed: 2546941
Change-Id: Ie42838a2e66200a5a52cc27600bd25e430c0e3f0
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2019-10-23 15:46:13 -07:00
Shravan Nevatia faf5312211 msm: camera: csiphy: Update CPHY 3-phase registers for CSIPHY v1.2
Fix CSI_EXTRA_CTRL12 CPHY 3phase registers as per
the latest HPG (rev. H).

CRs-Fixed: 2542855
Change-Id: I6c2fbc66df52db71c454c86ee894c05d12e0dead
Signed-off-by: Shravan Nevatia <snevatia@codeaurora.org>
2019-10-23 15:45:37 -07:00
Venkat Chinta 80560aa938 msm: camera: isp: Add log for first SOF in EPCR
This change adds a log for first SOF in early PCR.

CRs-Fixed: 2546941
Change-Id: Iaca8695f0886fecba84e40b06798818b3f864c35
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2019-10-21 16:34:38 -07:00
Venkat Chinta 898869cd11 msm: camera: ife: Remove line start addition
This change removes line start addition to epoch line config.
After CSID crop is applied, the first line that CAMIF
receives is already at the required line and therefore number
of lines for epoch should just be half of the frame width.

CRs-Fixed: 2546941
Change-Id: Ib12b1fc96cedf140672af03862aaf4be65ab38d8
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2019-10-21 16:33:04 -07:00
Trishansh Bhardwaj 35bead08c3 msm: camera: common: Fix compilation issues for 32-bit arch
Fix improper use of divide and modulo operator on 64 bit numbers.
Fix variable type to work with both 32/64 bit arch.

CRs-Fixed: 2543730
Change-Id: Ifa52d46dece3434d41308d284982a0cd8e17cd1b
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2019-10-21 15:46:03 -07:00
Vishalsingh Hajeri 037967bc88 msm: camera: ife: Dump ife camnoc debug registers
ife camnoc debug registers need to dumped only
when bus overflow status is set.

CRs-Fixed: 2538876
Change-Id: I6f886f6e084380de62c0b4acaa48fa02fce01136
Signed-off-by: Vishalsingh Hajeri <vhajeri@codeaurora.org>
2019-10-21 15:45:12 -07:00
Shravan Nevatia 3205f18e3c msm: camera: csiphy: Enable multi-datarate support for csiphy v1.2
Enable support for multiple data rates (2.5/3.5/4.5 Gsps)
for csiphy v1.2 driver.

CRs-Fixed: 2542855
Change-Id: Idbe299aca210e30d732304e77e2a8191c8809f09
Signed-off-by: Shravan Nevatia <snevatia@codeaurora.org>
2019-10-21 15:44:13 -07:00
Trishansh Bhardwaj a62a432522 msm: camera: cpas: Fix TCSR register programming
Program TCSR_CAMERA_HF_SF_ARES_GLITCH_MASK to ignore
erroneous signals.

CRs-Fixed: 2545751
Change-Id: Ie638136d364372b7a8309af1d9656a8c8b7772fc
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2019-10-21 15:41:45 -07:00
Venkat Chinta 064d662a3c msm: camera: isp: Update last applied request ID
This change updates last applied request ID when init packets
are applied and when stop ioctls are invoked.

CRs-Fixed: 2539888
Change-Id: I113b7897740d6577a4757ce41f9fcb1fff8c56e9
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2019-10-17 14:52:41 -07:00
Venkat Chinta 422de0bbf4 msm: camera: ife: Deinit input mux resources
We must deinit IFE input mux resources before the check for open
count. Without this change the last bus resource is the last to
enter this function when open count reaches zero. So input mux
resources are never deinitialized.

CRs-Fixed: 2545140
Change-Id: I355afce7d631cdb00e3f6da0ba0be40c2e2b63a2
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2019-10-17 14:52:03 -07:00
Karthik Anantha Ram 388c4f7280 msm: camera: reqmgr: Reset the pd tables as part of flush
As part of flush only the request slots were reset, we need
to reset the slots in each of the pd tables.

CRs-Fixed: 2545130
Change-Id: I34054dea2e5849739df9dd0a77d908a9af9fe3be
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2019-10-17 14:49:13 -07:00
Venkat Chinta 1dfd3efd17 msm: camera: ife: Disable early eof strobe
This change disables early eof strobe for version 480 hardware
due to hardware limitation.

CRs-Fixed: 2545140
Change-Id: I727ba5950911caac76cd2046e9e7c1e6d7ca6d96
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2019-10-16 14:38:41 -07:00