Commit Graph
743 Commits
Author SHA1 Message Date
Vikram Sharma 2a84188877 msm: camera: isp: Fix PPI index based on the phy selection
1) There is one to one mapping for ppi index with phy index
but phy select is not always equal to phy number,for some
targets "phy_sel = phy_idx + 1", and for some targets it is
"phy_sel = phy_idx", ppi_index should be updated accordingly.
2) Updated to configure ppi cfg register as.
 for cphy, disable dphy in config register.
 for dphy, do nothing (both cphy and dphy will be selected).
 then enable all lanes.

CRs-Fixed: 3057665
Change-Id: I1d5d66034a5563b5adcb8163acf9a668d10d4a19
Signed-off-by: Vikram Sharma <vikramsa@codeaurora.org>
2021-10-29 03:02:44 -07:00
Camera Software Integration d6feb1486e Merge "msm: camera: csiphy: Update Phy header file for 1.2.1" into camera-kernel.lnx.3.1 2021-10-29 02:52:37 -07:00
Vishal Verma f04fe7dfcf msm: camera: flash: Add support for i2c flash
Add Support for qup i2c based flash. Update i2c driver
probe function and added  init for gpio pin control
table. Since positive return values are not errors for
qup i2c rx and tx data transfer, fix the return type
for the APIs. Added check for null pointer in get flash
dt data for device node.

CRs-Fixed: 3056236
Change-Id: If33086c80bd7d5c1403aedf1a2c01867d6c56687
Signed-off-by: Vishal Verma <vishverm@codeaurora.org>
2021-10-28 17:49:11 +05:30
shiwgupt 538f7283f9 msm: camera: csiphy: Update Phy header file for 1.2.1
Update the cphy register settings in 1.2.1 phy header
file.

CRs-fixed: 3063363
Change-Id: I9a78ccdb6a91305c8b6d5fb014c9f0fe9c622f84
Signed-off-by: shiwgupt <shiwgupt@codeaurora.org>
2021-10-27 09:10:59 +05:30
Linux Build Service Account 0086bb941f Merge 9144efff1b on remote branch
Change-Id: I1e7d0903643321d701578d66ad7b7510a20f4b7e
2021-10-17 03:58:04 -07:00
Shravya Samala cf4b525b4a msm: camera: jpeg: Ensure in/out map entries are within allowed range
Added checks to make sure in_map /out_map entries of packet
io configs are within expected maximum value.

CRs-Fixed: 3007258
Change-Id: I7e5a652cd8f9ae104a10a2af551fe49930849b2d
Signed-off-by: Shravya Samala <shravyas@codeaurora.org>
2021-10-05 03:42:09 -07:00
Linux Build Service Account 37a0c2d4c2 Merge 39dd48f638 on remote branch
Change-Id: Icc79a08bc616a396fe1b34d42e1d5c8d9b2650cb
2021-09-30 10:53:06 -07:00
sokchetra eung 9144efff1b msm: camera: req_mgr: Table info dump removed
Remove dump_tbl_info function and all of its
invocations in CRM to prevent dumping all the
handle info when holding the spin lock.

CRs-Fixed: 3014074, 3014073
Change-Id: Ie98bafb489fc0d1f2d75cf0f3f08efb48d9b4062
Signed-off-by: sokchetra eung <eung@codeaurora.org>
2021-09-30 15:21:35 +05:30
Camera Software Integration 0548e19187 Merge "msm: camera: isp: Support all patterns for TOP TPG" into camera-kernel.lnx.3.1 2021-09-28 23:09:02 -07:00
Shravya Samala 42922dbe6e msm: camera: jpeg: Ensure in/out map entries are within allowed range
Added checks to make sure in_map /out_map entries of packet
io configs are within expected maximum value.

CRs-Fixed: 3007258
Change-Id: I7e5a652cd8f9ae104a10a2af551fe49930849b2d
Signed-off-by: Shravya Samala <shravyas@codeaurora.org>
2021-09-28 12:50:11 +05:30
Camera Software Integration 39dd48f638 Merge "msm: camera: smmu: Unmap secure buffers in secure camera use case" into camera-kernel.lnx.3.1 2021-09-27 00:33:56 -07:00
Dharmender Sharma 080521b70d msm: camera: isp: Support all patterns for TOP TPG
It provide support for differeent TPG patterns
like color bar, incrementing and user defined.

CRs-Fixed: 3026095
Change-Id: I8f7c4f3bb4c1c0d0026ff098d76b5664a66baca2
Signed-off-by: Dharmender Sharma <dharshar@codeaurora.org>
2021-09-24 10:55:00 +05:30
Camera Software Integration fed7ff4687 Merge "msm: camera: tfe: Correct Configuration of top tpg mux selection" into camera-kernel.lnx.3.1 2021-09-22 04:34:23 -07:00
Camera Software Integration f614d918cb Merge "msm: camera: ope: Check array size of input sync obj" into camera-kernel.lnx.3.1 2021-09-22 04:30:57 -07:00
Camera Software Integration 1fca0a1e0c Merge "msm: camera: common: Merge camera-kernel.4.0 changes in camera-kernel.3.1" into camera-kernel.lnx.3.1 2021-09-22 04:30:40 -07:00
Camera Software Integration f618a0674a Merge "msm: camera: flash: Maintain flash state in flash off" into camera-kernel.lnx.3.1 2021-09-22 04:29:37 -07:00
Shadul Shaikh fda10d28b0 msm: camera: smmu: Unmap secure buffers in secure camera use case
Dettach and unmap DMA buffers obtained previously from DMA attach
and mappings respectively.

CRs-Fixed: 3010444
Change-Id: I5c28a78f3ddc791743e298a1216ad661e4209e63
Signed-off-by: Shadul Shaikh <sshadu@codeaurora.org>
2021-09-21 09:59:50 +05:30
Linux Build Service Account 67b34a609a Merge 23e645d7f5 on remote branch
Change-Id: I49ad4016d103a0a3cba10efdefe204b97327aad5
2021-09-19 21:52:16 -07:00
Shravya Samala 111e9ba957 msm: camera: ope: Check array size of input sync obj
In case of input buffer, check array size of input sync obj before
assigning fence.

CRs-Fixed: 2821583
Change-Id: I5cd7968cfbe0be86a8967565616bf6eb1cf7fcf7
Signed-off-by: Shravya Samala <shravyas@codeaurora.org>
2021-09-15 16:28:10 +05:30
Pranav Sanwal fa429d92b0 msm: camera: tfe: Correct Configuration of top tpg mux selection
In case of concurrent tpg use case, configure top tpg mux sel
properly.

CRs-Fixed: 2804168
Change-Id: I9955c9f03cebac854a339ff5161a99ecaf27cbdf
Signed-off-by: Pranav Sanwal <psanwal@codeaurora.org>
2021-09-14 18:18:06 +05:30
Dharmender Sharma cedd2aa5d6 msm: camera: common: Merge camera-kernel.4.0 changes in camera-kernel.3.1
msm: camera: cdm: Add CDM hang detect and debug registers dump support
msm: camera: ope: free unused memory in ope acquire
msm: camera: cdm: Improve error handling during cdm hang
msm: camera: ope: Dump stripe info at the time of hang.

CRs-Fixed: 2878214
Change-Id: I998a71fb614be92c3a012a1823bdd2512d3af3d5
Signed-off-by: Dharmender Sharma <dharshar@codeaurora.org>
2021-09-14 14:12:17 +05:30
Camera Software Integration 23e645d7f5 Merge "msm: camera: cdm: Acquire mutex lock before accessing client data" into camera-kernel.lnx.3.1 2021-09-12 10:46:44 -07:00
shiwgupt bbdbe08137 msm: camera: flash: Maintain flash state in flash off
Maintain flash state in flash off for I2C flash.

Change-Id: Ieb605a79881b4091c8c3e4fac3a84731339b573f
Signed-off-by: shiwgupt <shiwgupt@codeaurora.org>
2021-09-09 12:02:01 +05:30
Shravya Samala 893c1a8295 msm: camera: cdm: Acquire mutex lock before accessing client data
There is a chance of use after release of client data in
cdm internal operation calls. Hence acquire mutex lock whenever
accessing client data to avoid use after release scenario.

CRs-Fixed: 3010261
Change-Id: Iaf7f41d56301299a6f63a5dc1090334063019881
Signed-off-by: Shravya Samala <shravyas@codeaurora.org>
2021-09-07 01:13:46 -07:00
Linux Build Service Account 4fadc54602 Merge b1ac875feb on remote branch
Change-Id: I46746b815543ce5660af3f6d6146d918769f5412
2021-09-05 23:24:27 -07:00
Trishansh Bhardwaj 85689be983 msm: camera: sync: Prevent OOB access of sync name
Issue:
strlcpy calls strlen on src ptr. If src is not NULL terminated then OOB
access will occur in below stack.
  strlen
  strlcpy
  cam_sync_init_row
  cam_sync_handle_create
  cam_sync_dev_ioctl

Fix:
Pad user-space supplied name with NULL.

CRs-Fixed: 3010262
Change-Id: Ib5c2fbfe395025ec05e0bb2980f86111e95ff54c
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2021-09-01 02:51:37 -07:00
Camera Software Integration b1ac875feb Merge "msm: camera: flash: Add support for flash stream off" into camera-kernel.lnx.3.1 2021-08-30 00:48:05 -07:00
Camera Software Integration e24cc49b5c Merge "msm: camera: isp: Reapply bubble request in RDI path" into camera-kernel.lnx.3.1 2021-08-23 11:46:36 -07:00
Linux Build Service Account ff77ea6b60 Merge 2b619fd268 on remote branch
Change-Id: If03277e2dd29c63bc4079f1e155080956beb4c0a
2021-08-23 01:59:13 -07:00
shiwgupt 0c9bd2865b msm: camera: flash: Add support for flash stream off
- Apply flash off register settings at the time of stream off.
- Add support to send fire command in initial config command.

CRs-Fixed: 2998772
Change-Id: I8897a68e637d283afd98e386b6a7b1fbaaf63c61
Signed-off-by: shiwgupt <shiwgupt@codeaurora.org>
2021-08-19 09:27:45 +05:30
Wyes Karny 9535366b65 msm: camera: isp: Reapply bubble request in RDI path
For recovery of the bubble the request from active list
should be added back to pending request list.

Change-Id: I8d7d6726ddc3e720665e53e4979a7907b09d86aa
CRs-Fixed: 3011917
Signed-off-by: Wyes Karny <wkarny@codeaurora.org>
2021-08-16 15:00:09 +05:30
shiwgupt 2b619fd268 msm: camera: flash: Handle I2C flash request deletion
Handle I2C flash request deletion in the buffer so that
new request can be added.

CRs-Fixed: 3002966
Change-Id: I774a49c687832ef566071ae3ec4249bf425e94c2
Signed-off-by: shiwgupt <shiwgupt@codeaurora.org>
2021-08-10 14:47:03 +05:30
Linux Build Service Account 0fa94eb694 Merge 5ab24d0f0c on remote branch
Change-Id: Ie8e8a58845c18b25dceba75fa78ecae14541562d
2021-08-01 21:36:59 -07:00
Camera Software Integration 5ab24d0f0c Merge "msm: camera: sensor: Read gpios property from dt node" into camera-kernel.lnx.3.1 2021-07-24 07:04:27 -07:00
Camera Software Integration da5d1def8c Merge "msm: camera: tfe: Fix CSID probe" into camera-kernel.lnx.3.1 2021-07-24 06:57:41 -07:00
Alok Pandey d59ab976dd msm: camera: ope: Correctng OPE version for KHAJE
OPE probe is failing due to incorrect OPE version.
Correcting OPE version as a fix.

CRs-Fixed: 2994159
External Impact: No
Change-Id: I8c4de8aa76c1da883a922b1ca873b31e8937ca03
Signed-off-by: Alok Pandey <akumarpa@codeaurora.org>
2021-07-19 14:44:14 +05:30
Tony Lijo Jose 47cb7dc083 msm: camera: sensor: Read gpios property from dt node
Currently cam-res-mgr uses the virtual gpio number (A global gpio number
among all the gpio modules) in case of shared gpio. We cannot know this
upfront as the mapping varies between targets. This change allows to use
the shared gpios using gpios property, where we can mention the gpio module
and the gpio number used.

CRs-Fixed: 2994159
Change-Id: Ic60eeace89e5223eaeee5a7709bb3beee4127bb0
Signed-off-by: Tony Lijo Jose <tjose@codeaurora.org>
2021-07-19 13:22:01 +05:30
Alok Pandey 3e723e5d21 msm: camera: tfe: Fix CSID probe
CSID probe is failing due to PPI getting probed later than CSID.
Fix:
 - PPI initialization failure as non-fatal.
 - Reordering compilation to call PPI probe before csid.

CRs-Fixed: 2994159
External Impact: No
Change-Id: I43948b28ef044eaaef2c72027e991f1fa63bee02
Signed-off-by: Alok Pandey <akumarpa@codeaurora.org>
2021-07-19 03:29:36 +05:30
Linux Build Service Account c60aa7dab8 Merge a50c3608d6 on remote branch
Change-Id: I567e607fa24fb592e6d1a602dcf9db91cf467f90
2021-07-02 00:04:03 -07:00
Camera Software Integration ad4b86bd53 Merge "msm: camera: csiphy: Update CSIPHY settings as per HPG" into camera-kernel.lnx.3.1 2021-06-28 22:41:54 -07:00
Camera Software Integration 1d79547b4c Merge "msm: camera: flash: Add support for I2C flash" into camera-kernel.lnx.3.1 2021-06-28 22:41:24 -07:00
Camera Software Integration 094c2d94dc Merge "msm: camera: isp: Added PPI driver functionality" into camera-kernel.lnx.3.1 2021-06-28 22:40:28 -07:00
Anil Kumar Kanakanti 09c9c132ce msm: camera: csiphy: Update CSIPHY settings as per HPG
CSIPHY settings updated based on latest HPG settings.

CRs-Fixed: 2974853
Change-Id: I3cb3d25bddf707ee9d57a145e0506487b12e487e
Signed-off-by: Anil Kumar Kanakanti <akanakan@codeaurora.org>
2021-06-23 03:11:58 -07:00
shiwgupt 1540124a6e msm: camera: flash: Add support for I2C flash
- Add Regulator power up for I2C flash
- Add GPIO support in probe call for I2C flash
- Add flash type in query capability call of flash.

CRs-Fixed: 3660915
Change-Id: I64ecba3fa4176972e819b11f2a65340c24f85d4f
Signed-off-by: shiwgupt <shiwgupt@codeaurora.org>
2021-06-21 21:33:47 +05:30
Camera Software Integration a50c3608d6 Merge "msm: camera: csiphy: Propagate CSIPHY settings for 1.2.1" into camera-kernel.lnx.3.1 2021-06-18 06:12:19 -07:00
Camera Software Integration 02996c689b Merge "msm: camera: cdm: Add support for CDM 2.1" into camera-kernel.lnx.3.1 2021-06-14 23:13:31 -07:00
Camera Software Integration af3afa6b8c Merge "msm: camera: cpas: Add support for Khaje Camera" into camera-kernel.lnx.3.1 2021-06-14 23:13:11 -07:00
shiwgupt d1785b6f9f msm: camera: csiphy: Propagate CSIPHY settings for 1.2.1
CSIPHY settings are propagated for version 1.2.1 from
4.0 to 3.1.

CRs-Fixed: 2966344
Change-Id: Id315bfcde4c29d2fa491be17d46544371716c5a9
Signed-off-by: shiwgupt <shiwgupt@codeaurora.org>
2021-06-10 18:49:53 +05:30
Ayush Kumar 66dc2207fe msm: camera: isp: Added PPI driver functionality
PPI is a bridge between CSIPHY and CSID. Responsibilty of this driver is to
enable and configure PPI bridge from CSID as per the configuration.

CRs-Fixed: 2960970
Change-Id: I0606b8ee06f6fbc2f84c3be628f356192a79f5a5
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2021-06-10 12:58:22 +05:30
Ayush Kumar d86bddbd78 msm: camera: cpas: Add support for Khaje Camera
Khaje has different version of CPAS version which
requires camnoc interface changes and CPAS version
change. This change adds the same.

CRs-Fixed: 2960970
Change-Id: Iff58b7872129966879ecadab058d1d57cd439bea
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2021-06-08 12:03:19 +05:30