Commit Graph

1567 Commits

Author SHA1 Message Date
Haritha Chintalapati
32b6adfc86 Merge "msm: camera: isp: Reset device enabled during CSID stop" into camera-kernel.lnx.5.0 2021-05-14 19:38:42 -07:00
Haritha Chintalapati
6dc28f8c2d Merge "msm: camera: isp: Prevent false timeout in dual IFE reset" into camera-kernel.lnx.5.0 2021-05-13 12:05:45 -07:00
Haritha Chintalapati
b14f3420a7 Merge "msm: camera: isp: Set RDI only context flag for CSID resource node" into camera-kernel.lnx.5.0 2021-05-13 12:05:31 -07:00
Haritha Chintalapati
8fc496e430 Merge "msm: camera: isp: Move clock voting to common vfe top" into camera-kernel.lnx.5.0 2021-05-13 12:05:16 -07:00
Haritha Chintalapati
64d562975b Merge "msm: camera: isp: Do not handle recoverable errors as fatal" into camera-kernel.lnx.5.0 2021-05-13 12:04:45 -07:00
Haritha Chintalapati
0542af5b27 Merge "msm: camera: utils: Enable using mmrm API in camera" into camera-kernel.lnx.5.0 2021-05-13 12:04:28 -07:00
Haritha Chintalapati
2e994b2c81 Merge "msm: camera: utils: Add using mmrm in camera" into camera-kernel.lnx.5.0 2021-05-13 12:03:54 -07:00
Haritha Chintalapati
c166730fd2 Merge "msm: camera: cpas: Add qchannel register info for v680 hw" into camera-kernel.lnx.5.0 2021-05-13 12:03:33 -07:00
Haritha Chintalapati
6f47c080ff Merge "msm: camera: cpas: Move camnoc register offsets to header" into camera-kernel.lnx.5.0 2021-05-13 12:03:14 -07:00
Gaurav Jindal
4ea7741460 msm: camera: isp: Reset device enabled during CSID stop
Device enabled flag is not set during stop preventing the
buf done irq mask to be set during next start without disabling
the core.
This commit adds device_enabled flag to false during csid stop
call.

CRs-Fixed: 2943893
Change-Id: Ic9c6a86219a6e3761b50817c94c0e6b89a6fde95
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2021-05-12 11:56:59 +05:30
Anand Ravi
6a35b87cdd msm: camera: isp: Prevent false timeout in dual IFE reset
In dual IFE case, HW reset times out because completion struct gets
reinited after reset IRQ is received and before going into wait. During
SW reset, 3 IRQs are observed, 2 during master reset and 1 during slave.
This can cause the done count in the completion struct to be increment
by 1 for the slave CSID during SW reset and result in incorrect
reporting of IRQs during the next reset call.

To solve this problem, there are two reinit_completion calls:
	1. Pre-reset command: Only for SW reset. This is to clear the
	completion struct in the cases of HW reset timeout followed by
	reset IRQ or slave reset IRQ triggerred by master.
	2. Post-reset command: For both HW and SW reset. This is to
	clear the completion struct after successful reset command to
	use it again during next reset.

CRs-Fixed: 2846451
Change-Id: I6d416a63e6d7e3828e55d1deece56b38a349f99f
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-05-07 19:53:05 -07:00
Haritha Chintalapati
59495e3681 Merge "msm: camera: isp: Change acquire logic for SFE streams" into camera-kernel.lnx.5.0 2021-05-07 19:35:21 -07:00
Haritha Chintalapati
047807a4ca Merge "msm: camera: isp: Enable separate base for CSID lite" into camera-kernel.lnx.5.0 2021-05-07 19:24:27 -07:00
Gaurav Jindal
9b395a90b5 msm: camera: isp: Do not handle recoverable errors as fatal
Flag fatal_err_detected is getting set for recoverable errors
as well. This causes  false propagation of errors.
This commit removes the handling of recoverable errors as fatal.

CRs-Fixed: 2940802
Change-Id: I25710287efe918d8f97618ca24eea57378abed3c
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2021-05-07 13:29:54 +05:30
Mukund Madhusudan Atre
3fe8a6bac8 msm: camera: cpas: Add qchannel register info for v680 hw
Before powering down Top HM, qchannel handshake needs to be
done to ensure camnoc is idle. Add qchannel register info
to enable handshake on v680 hardware.

CRs-Fixed: 2841729
Change-Id: I55c240dc0f780fb5f8339dbd0a2d9aa4ef280be4
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-05-06 23:28:53 -07:00
Mukund Madhusudan Atre
98b269d0b0 msm: camera: isp: Move clock voting to common vfe top
Currently, clock update function is same between different
vfe top versions. Move clock voting functions to common
top to avoid duplication.

CRs-Fixed: 2841729
Change-Id: I2504632a260ea18f8b5e38e65395db95375588bb
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-05-06 23:25:18 -07:00
Mukund Madhusudan Atre
a9c89d1f41 msm: camera: cpas: Move camnoc register offsets to header
Currently, camnoc buffer fill level register offsets are part
of cpas monitoring. Register offsets keep changing between
targets which would bring more conditionals. Make cpas monitoring
generic by moving register offsets to header. Also, the reg values
will be read in a buffer, and it can be controlled what offset
needs to be read, by changing status in header to be enable/disable.
Also, move camnoc fill level printing to CPAS for when we need only
buffer fill info.

CRs-Fixed: 2841729
Change-Id: I05425b4466d33dbef80eb8a0a1b5e974a6965600
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-05-06 23:18:41 -07:00
Haritha Chintalapati
756edf7cf2 Merge "msm: camera: isp: Fix HW index to IFE HW mapping logic" into camera-kernel.lnx.5.0 2021-05-06 20:32:10 -07:00
Haritha Chintalapati
3d62e633cc Merge "msm: camera: isp: Enable sys cache usage" into camera-kernel.lnx.5.0 2021-05-06 20:32:06 -07:00
Haritha Chintalapati
212ab43481 Merge "msm: camera: cci: Add report id in report command for CCI I2C queue" into camera-kernel.lnx.5.0 2021-05-06 20:32:01 -07:00
Anand Ravi
83738d1ac2 msm: camera: isp: Set RDI only context flag for CSID resource node
This commit fixes regression in RDI only usecase caused by 'commit
afc2f5cb ("msm: camera: isp: Change Start flow of CSID paths")'.

CRs-Fixed: 2846451
Change-Id: I9be699ed2045b83c2657ce5fd879e89fe64c909a
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-05-06 17:56:50 -07:00
Haritha Chintalapati
bd5db9e311 Merge "msm: camera: isp: Fix issue while printing hbi and vbi" into camera-kernel.lnx.5.0 2021-05-05 22:06:20 -07:00
Haritha Chintalapati
f144ee8473 Merge "msm: camera: utils: Add camera clk wrapper infrastructure" into camera-kernel.lnx.5.0 2021-05-05 22:06:15 -07:00
Haritha Chintalapati
b709f8cd80 Merge "msm: camera: isp: Change Start flow of CSID paths" into camera-kernel.lnx.5.0 2021-05-05 22:06:11 -07:00
Haritha Chintalapati
5427c398a4 Merge "msm: camera: isp: Add support to discard set number of frames" into camera-kernel.lnx.5.0 2021-05-05 22:06:06 -07:00
Haritha Chintalapati
8fe87bc27f Merge "msm: camera: uapi: Add support to drop initial sensor frames" into camera-kernel.lnx.5.0 2021-05-05 22:06:01 -07:00
Haritha Chintalapati
8ca1cf7ff4 Merge "msm: camera: csiphy: Update the csiphy programming sequence" into camera-kernel.lnx.5.0 2021-05-05 22:05:57 -07:00
Anand Ravi
5ccd969aa7 msm: camera: isp: Enable separate base for CSID lite
This change allows IFE hardware manager context to see CSID lite as a
different base and process blob commands consistently for full and lite
CSID.

CRs-Fixed: 2846451
Change-Id: I663be55ef09395125d45746e4664272865980eef
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-05-05 11:44:47 -07:00
Anand Ravi
928a3140d2 msm: camera: isp: Fix HW index to IFE HW mapping logic
This fixes logical error in 'commit de6ee5504a ("msm: camera: isp:
Remove CPAS version check from IFE HW manager")'.

CRs-Fixed: 2926668
Change-Id: I1bac5972eb24b2920b079cb7d6b532052b51bb55
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-05-05 10:06:08 -07:00
Karthik Anantha Ram
3cb524ec42 msm: camera: isp: Enable sys cache usage
Enable sys cache usage by default for sHDR use-cases. The change
also updates a log to indicate cache config for a given resource.

CRs-Fixed: 2841729
Change-Id: Ie6c8530982fd0c36913e20c5359367d8dcffa66b
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-05-04 21:20:47 -07:00
Gaurav Jindal
afc2f5cbfe msm: camera: isp: Change Start flow of CSID paths
Enable RX after starting path and change the call
flow of start from hw manager to csid driver.

CRs-Fixed: 2841729
Change-Id: Ie758b1f8cd1137baf1f4eec3d38319e8b4f6e959
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2021-05-03 21:17:09 -07:00
Karthik Anantha Ram
c9002665c5 msm: camera: isp: Add support to discard set number of frames
Add support to discard initial number of frames for all paths
at CSID input. The number of frames to discard is obtained
from userland in blob config.

CRs-Fixed: 2841729
Change-Id: I86ce1109b507fe12ee06da870b9242d2aa40c5e0
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-05-03 21:15:26 -07:00
Savita Patted
c2889122d0 Merge "msm: camera: isp: Add support for SFE sys cache config" into camera-kernel.lnx.5.0 2021-05-03 20:23:26 -07:00
Karthik Anantha Ram
cf9c149e52 msm: camera: uapi: Add support to drop initial sensor frames
This change introduces a blob to obtain number of frames to be
dropped in CSID when sensor is streamed on. This parameter will
be applicable for all paths in the pipeline.

CRs-Fixed: 2841729
Change-Id: Idcf1f6c8223f885c82883aa1d5fdf6981ffcc813
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-05-03 20:02:38 -07:00
Jigar Agrawal
2aee6a3692 msm: camera: csiphy: Update the csiphy programming sequence
Update CSIPHY 2.1.0 bringup sequence.

CRs-Fixed: 2929063
Change-Id: I1e7b3560094f82e572b6543a336c5926bd9c5220
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2021-05-03 10:23:26 -07:00
Pavan Kumar Chilamkurthi
ba7a561d66 msm: camera: utils: Enable using mmrm API in camera
Enable using mmrm APIs for camera clk set rates.

CRs-Fixed: 2901925
Change-Id: Id80f2d46b62aef9ebcbb238a342925c74aac053a
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2021-05-02 00:00:03 -07:00
Pavan Kumar Chilamkurthi
028d6ec734 msm: camera: utils: Add using mmrm in camera
Use mmrm interface to set clock rate on all
camera clks.

CRs-Fixed: 2901925
Change-Id: I2e4c31a11e0e068693ac15356e3b3dafcfa0b078
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2021-05-01 23:59:09 -07:00
Haritha Chintalapati
020e9a7d77 Merge "msm: camera: utils: Add support for multiline printing to log buffers" into camera-kernel.lnx.5.0 2021-04-30 19:17:36 -07:00
Haritha Chintalapati
be8a9b9af0 Merge "msm: camera: isp: Remove capture control register configurations" into camera-kernel.lnx.5.0 2021-04-30 19:17:24 -07:00
Haritha Chintalapati
9d1cb39b8f Merge "msm: camera: csiphy: Move AON Camera select control" into camera-kernel.lnx.5.0 2021-04-30 19:17:20 -07:00
Haritha Chintalapati
53f079a679 Merge "msm: camera: csiphy: Update the csiphy programming sequence" into camera-kernel.lnx.5.0 2021-04-30 19:17:16 -07:00
Haritha Chintalapati
c796ffd58f Merge "msm: camera: sensor: Extend I2C read/write size" into camera-kernel.lnx.5.0 2021-04-30 17:32:02 -07:00
Haritha Chintalapati
77b450ba67 Merge "msm: camera: isp: Optimize logging in CSID and VFE" into camera-kernel.lnx.5.0 2021-04-30 17:31:46 -07:00
Haritha Chintalapati
f55270528c Merge "msm: camera: sensor: Change regulator get,put to devres entry" into camera-kernel.lnx.5.0 2021-04-30 17:31:27 -07:00
Haritha Chintalapati
47e8ab4258 Merge "msm: camera: sensor: Correct condition check for BURST/SEQ write" into camera-kernel.lnx.5.0 2021-04-30 17:31:14 -07:00
Haritha Chintalapati
facbe0251d Merge "msm: camera: reqmgr: Only do self-correction at SOF" into camera-kernel.lnx.5.0 2021-04-30 17:31:05 -07:00
Karthik Anantha Ram
0809674571 msm: camera: isp: Change acquire logic for SFE streams
Change few checks to correctly acquire PD and RDI ports with SFE.

CRs-Fixed: 2841729
Change-Id: I11ad0ad77d5a1fbac17b5919a52168ae31250297
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-04-30 12:15:42 -07:00
Karthik Anantha Ram
c369310c4a msm: camera: isp: Add support for SFE sys cache config
Add support for using system cache for SFE WMs and RMs
in case of sHDR use-cases for power saving. Also add
debugfs capability to control this feature.

CRs-Fixed: 2841729
Change-Id: Ic4dad50e8c396705b33bb0bc8330d25e51ca79a2
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-04-30 12:14:24 -07:00
Camera Software Integration
01c57a9a06 Merge "msm: camera: isp: Add support for MMU prefetch for IFE/SFE WMs" into camera-kernel.lnx.5.0 2021-04-28 21:23:50 -07:00
Camera Software Integration
6c5c19ff95 Merge "msm: camera: uapi: Add interface for obtaining exposure order" into camera-kernel.lnx.5.0 2021-04-28 21:23:43 -07:00