Commit graph

1,234 commits

Author SHA1 Message Date
Camera Software Integration
196f4e6b2f Merge "msm: camera: smmu: Disable SMMU stall on page fault" into camera-kernel.lnx.4.0 2021-06-18 06:55:38 -07:00
Camera Software Integration
e40030134a Merge "msm: camera: flash: Add support for I2C flash" into camera-kernel.lnx.4.0 2021-06-13 10:12:43 -07:00
Camera Software Integration
96d421450c Merge "msm: camera: cci: Fix CCI Timeout during burst_read concurrency" into camera-kernel.lnx.4.0 2021-06-13 10:12:28 -07:00
Camera Software Integration
fb2d46d420 Merge "msm: camera: isp: Mask process_bubble for SHDR usecase" into camera-kernel.lnx.4.0 2021-06-13 10:12:15 -07:00
Camera Software Integration
1a281195e2 Merge "msm: camera: sensor: Increase slot ids in sensor" into camera-kernel.lnx.4.0 2021-06-07 23:01:08 -07:00
Camera Software Integration
adc097c23e Merge "msm: camera: sensor: extend I2C read/write size" into camera-kernel.lnx.4.0 2021-06-07 23:00:49 -07:00
Anil Kumar Kanakanti
0c570733ee msm: camera: cci: Fix CCI Timeout during burst_read concurrency
During burst read concurrency, is_burst_read variable not updated
properly leading to missing th_complete signal. is_burst_read variable
updated per master to avoid concurrency issue.

CRs-Fixed: 2962232
Change-Id: Id741d48e0b9a6987b4aa7bc7361daf555d9bc587
Signed-off-by: Anil Kumar Kanakanti <akanakan@codeaurora.org>
2021-06-07 16:20:12 +05:30
Shravya Samala
bc32fa9ef8 msm: camera: smmu: Disable SMMU stall on page fault
Changes are made to disable stall on pagefault
for all the driver contexts inorder to
support for smmu stall on page fault.

CRs-Fixed: 2936320
Change-Id: Id3d16b4d980349044de1bc1d1bf4bfad5aee79f4
Signed-off-by: Shravya Samala <shravyas@codeaurora.org>
2021-06-04 03:46:55 -07:00
Camera Software Integration
5bdd66fa28 Merge "msm: camera: config: Add Support for monaco target" into camera-kernel.lnx.4.0 2021-06-03 04:41:38 -07:00
Camera Software Integration
078dd57d7d Merge "msm: camera: sensor: fix 64-bit division for 32-bit kernel compilation" into camera-kernel.lnx.4.0 2021-06-03 04:41:14 -07:00
shiwgupt
de2b0fb94b 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: 2938804
Change-Id: I7d5575ecdf4c1c3b329e6bf49586771e37611e5a
Signed-off-by: shiwgupt <shiwgupt@codeaurora.org>
2021-06-01 23:29:10 +05:30
Jigar Agrawal
7a10111a87 msm: camera: sensor: Increase slot ids in sensor
Increase the max supported slot ids to 16 in sensor.

CRs-Fixed: 2871214
Change-Id: I08910f2c34f70333bf25dbb31de5994c3beb7a8f
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-05-27 10:33:56 -07:00
Camera Software Integration
67373afb96 Merge "msm: camera: core: Make Blair camera module dynamic" into camera-kernel.lnx.4.0 2021-05-27 07:24:22 -07:00
Amit Somani
56f616b463 msm: camera: sensor: fix 64-bit division for 32-bit kernel compilation
Fix a 64bit division error for 32bit kernel compilation.

CRs-Fixed: 2918290
Change-Id: Ic729644088eb6e8640de240d76b2e8971d2f569c
Signed-off-by: Amit Somani <amitsm@codeaurora.org>
2021-05-26 22:21:56 +05:30
Depeng Shao
93f25fccc8 msm: camera: isp: Mask process_bubble for SHDR usecase
SHDR usecase doesn't report bubble to CRM, but we still
need to know whether it is processing bubble during
applying request, since we may haven't received the
reg update of the previous applied request, then
we have a chance to apply a new req to HW, this may
result in overflow issue. This change masks the
process_bubble for SHDR case during epoch in applied
sub state.

CRs-Fixed: 2948932
Change-Id: I699a2f59ea874693b78a918895db98727b95c634
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2021-05-26 10:56:03 +08:00
Camera Software Integration
d89a81f7e2 Merge "msm: camera: ife: Program image addr for once in RDI batch mode" into camera-kernel.lnx.4.0 2021-05-24 23:54:02 -07:00
Camera Software Integration
6f91e88b55 Merge "msm: camera: isp: Update the reported_req_id correctly" into camera-kernel.lnx.4.0 2021-05-24 23:48:46 -07:00
Camera Software Integration
39599117b7 Merge "msm: camera: cpas: Add support for blair camnoc" into camera-kernel.lnx.4.0 2021-05-24 23:48:11 -07:00
Sureshnaidu Laveti
5c97b95b7b msm: camera: sensor: extend I2C read/write size
Extend I2C read/write capability to 20kb

CRs-Fixed: 2952585
Change-Id: Ia5465342fd1d434f90e472c3dd5a5275c3fab8cd
Signed-off-by: Sureshnaidu Laveti <lsuresh@codeaurora.org>
2021-05-24 14:25:17 +05:30
Ayush Kumar
d3f13f02a4 msm: camera: core: Make Blair camera module dynamic
This change is to make Blair camera module dynamic.

CRs-Fixed: 2944976
Change-Id: I1af60fd3e1e607f52285d7abf30321ff6682149e
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2021-05-21 12:24:08 +05:30
Amit Somani
4c9ba2b362 msm: camera: config: Add Support for monaco target
Add camera config support for MONACO target.

CRs-Fixed: 2918290
Change-Id: I98ff2a0d540aa6a4fb5a31a8d26f7abe0750918d
Signed-off-by: Amit Somani <amitsm@codeaurora.org>
2021-05-19 17:43:46 -07:00
Camera Software Integration
e182f855ab Merge "msm: camera: req_mgr: Fix deadlock in ICP driver in close sequence" into camera-kernel.lnx.4.0 2021-05-19 08:45:17 -07:00
Camera Software Integration
c2dda7e67d Merge "Revert "Revert "msm: camera: req_mgr: Enhance camera v4l2 subdev shutdown sequence""" into camera-kernel.lnx.4.0 2021-05-19 08:44:51 -07:00
Camera Software Integration
c48130dff1 Merge "msm: camera: icp: allow icp debug clock for debug purpose" into camera-kernel.lnx.4.0 2021-05-12 22:15:53 -07:00
Camera Software Integration
a8eb1b80e1 Merge "msm: camera: ife: Update resource state in tpg start" into camera-kernel.lnx.4.0 2021-05-12 22:15:23 -07:00
Alok Chauhan
41716fade5 msm: camera: req_mgr: Fix deadlock in ICP driver in close sequence
ICP driver is not releasing mutex in error scenario
in close sequence and causing deadlock further in open.

Fix the deadlock and avoid prints in other driver
while close in provider crash.

CRs-Fixed: 2938073
Change-Id: I226c9a8e9b2d0c30e90282b11fbd15ea0b085f87
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
2021-05-09 11:56:54 -07:00
Sridhar Gujje
9f18463541 Revert "Revert "msm: camera: req_mgr: Enhance camera v4l2 subdev shutdown sequence""
This reverts commit 4a487d9638.

Change-Id: I9d052d9260581ed8155d3fbd3e5eff3a81247306
Signed-off-by: Sridhar Gujje <sgujje@codeaurora.org>
2021-05-09 11:56:02 -07:00
Ayush Kumar
f6f57c8d7f msm: camera: cpas: Add support for blair camnoc
Blair has different version of CPAS version which
requires camnoc interface changes and CPAS version
change. This change adds the same.

CRs-Fixed: 2944976
Change-Id: I700d99e52dacee9badcb2f66a7a295fb18771231
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2021-05-06 16:38:32 +05:30
Camera Software Integration
34e2308084 Merge "msm: camera: isp: Reset csid error irq count on flush" into camera-kernel.lnx.4.0 2021-05-04 09:55:38 -07:00
Camera Software Integration
3224b69647 Merge "msm: camera: reqmgr: Only do self-correction at SOF" into camera-kernel.lnx.4.0 2021-05-04 09:55:10 -07:00
Alok Chauhan
e1f751f760 msm: camera: ife: Update resource state in tpg start
Resource state is not proper during csid stop for PHY TPG hence stop
doesn't call for it.

Update the correct resource state during tpg start for PHY TPG.

CRs-Fixed: 2906168
Change-Id: Ib5fd05a380f6e1dbb303af23b7b0017d9f88c125
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
2021-04-30 16:34:20 +05:30
Camera Software Integration
dd5d08d0d4 Merge "msm: camera: isp: Check ife out res validity" into camera-kernel.lnx.4.0 2021-04-28 05:32:25 -07:00
Camera Software Integration
f9f98b6936 Merge "msm: camera: tfe: Drop first rdi frame in dual tfe scenario" into camera-kernel.lnx.4.0 2021-04-28 05:26:34 -07:00
Camera Software Integration
84df0f25e9 Merge "msm: camera: cpas: Change to set OT value to 8 for RT block" into camera-kernel.lnx.4.0 2021-04-28 05:26:18 -07:00
Tejas Prajapati
c4d768fad0 msm: camera: ife: Program image addr for once in RDI batch mode
For RDI only batch mode use case the image address needs to
be programmed only once the consecutive image address is
taken from the frame increament address and image address
we have provided.

CRs-Fixed: 2948881
Change-Id: I94bce9522aaace00b567b023bba1cc3443d849ef
Signed-off-by: Tejas Prajapati <tpraja@codeaurora.org>
2021-04-27 17:00:34 +05:30
Depeng Shao
6f9f6f4854 msm: camera: reqmgr: Only do self-correction at SOF
Since the SOF timestamp is only updated at SOF,
so we can't do self-correction at EOF. When the
frames already in sync, but the req is a EOF
triggered req, then the req can't be applied at
SOF, but it will fail to pass self-correction
checking at EOF. Then we will loop this progress,
the req can't be applied anymore.

CRs-Fixed: 2930497
Change-Id: I079cbd3cb9ac9541f049c5369baeee831f7444a2
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2021-04-26 15:46:03 +08:00
Depeng Shao
dd8b69b832 msm: camera: isp: Update the reported_req_id correctly
The request id is updated to 0 when the substate is
BUBBLE, then the original request id can't be notified
to UMD, since the reported_req_id is already updated to
the original request id. This change updateds the
reported_req_id only when the final request id is
valid.

CRs-Fixed: 2932602
Change-Id: Ib30f849782283c647f784cfb0deb49bee3d04287
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2021-04-26 13:49:55 +08:00
Camera Software Integration
f9f491b84d Merge "msm: camera: isp: Add support for YUV422 10 bit" into camera-kernel.lnx.4.0 2021-04-22 09:38:42 -07:00
Camera Software Integration
ac8728a994 Merge "msm: camera: sensor: Add data rate table for holi" into camera-kernel.lnx.4.0 2021-04-22 09:38:28 -07:00
Camera Software Integration
1eccc13e1e Merge "msm: camera: ife: pagefault_ops access protected with mutex_lock" into camera-kernel.lnx.4.0 2021-04-22 09:38:12 -07:00
Vikram Sharma
72c9ddcce9 msm: camera: isp: Check ife out res validity
This change adds validity check for ife out res. If ife out res is
NULL we can run into crash or issues.

CRs-Fixed: 2915741
Change-Id: I8722b2a4e2634bda42f0080e00bf09050bbd6b91
Signed-off-by: Vikram Sharma <vikramsa@codeaurora.org>
2021-04-21 00:30:45 -07:00
Sridhar Gujje
0067edcd22 Revert "msm: camera: csiphy: Update CSIPHY settings based recommendation"
This reverts commit 89c548e862.

Change-Id: I0a979e5352aec48df946dd9cd584de6a69bde674
Signed-off-by: Sridhar Gujje <sgujje@codeaurora.org>
2021-04-20 18:22:42 +05:30
Ayush Kumar
8570262453 msm: camera: isp: Reset csid error irq count on flush
This change is to reset csid_error_irq_count on flush
to prevent from recovery.

CRs-Fixed: 2926200
Change-Id: I8568fdc679317e41c31f4aeb9cf8c3ae579d8448
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2021-04-19 16:38:46 +05:30
Camera Software Integration
d313b62f5e Merge "msm: camera: csiphy: Update CSIPHY settings based recommendation" into camera-kernel.lnx.4.0 2021-04-18 23:05:56 -07:00
Camera Software Integration
c83454fe55 Merge "Revert "msm: camera: req_mgr: Re-design CRM to support multi links in sync mode"" into camera-kernel.lnx.4.0 2021-04-18 23:05:37 -07:00
Sridhar Gujje
4a487d9638 Revert "msm: camera: req_mgr: Enhance camera v4l2 subdev shutdown sequence"
This reverts commit 8564c26920.

Change-Id: Idb956f2da5cf954c08f2f3e2af391939d859fd8a
Signed-off-by: Sridhar Gujje <sgujje@codeaurora.org>
2021-04-18 12:31:34 -07:00
Ravikishore Pampana
8f9d699778 msm: camera: tfe: Drop first rdi frame in dual tfe scenario
In Dual tfe scenario, tfe csid drop first frame in the ipp pix
path to sync both master and slave, but rdi frame will go to tfe.
this will cause issues in the camif and rdi sub sampling scenarios.
in sub sampling scenarios both camif and rdi should be subsampled
on same frames. To achieve this drop the rdi first frame from csid
in dual tfe scenarios.

Change-Id: I73e98a6d3d973af93bbe6afef7585a95578f2a2b
CRs-Fixed: 2923045
Signed-off-by: Ravikishore Pampana <rpampana@codeaurora.org>
2021-04-18 18:11:53 +05:30
Gaurav Jindal
2ca3aa523b msm: camera: isp: Add support for YUV422 10 bit
Add support for YUV422 format 10 bit in CSID and bus drivers.

CRs-Fixed: 2923254
Change-Id: Icecc367d88509b9ed08f5d0cab8c4da788886a0a
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2021-04-17 17:20:45 +05:30
Ayush Kumar
d3c7cff028 msm: camera: cpas: Change to set OT value to 8 for RT block
This change is set the OT values for RT client of Camonc
to 8 for Yupik camera.

CRs-Fixed: 2924987
Change-Id: Icb7f30c23f5899558a41308fe313d46fd8d992a3
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2021-04-16 11:02:10 +05:30
Camera Software Integration
a1e44aa4e6 Merge "Revert "msm: camera: req_mgr: Validate active sequence id in link control"" into camera-kernel.lnx.4.0 2021-04-15 11:19:11 -07:00