Commit Graph

1804 Commits

Author SHA1 Message Date
Savita Patted
7ae3a4cf34 Merge "msm: camera: reqmgr: Add missing spin unlock call" into camera-kernel.lnx.5.0 2021-06-25 16:16:48 -07:00
Savita Patted
2bceefc812 Merge "msm: camera: isp: Fix the format measure logging" into camera-kernel.lnx.5.0 2021-06-25 16:16:15 -07:00
Karthik Anantha Ram
0999770372 msm: camera: isp: Modify check to avoid NULL dereference
Modify cdm ops check in IFE/SFE bus to avoid NULL pointer dereference.

CRs-Fixed: 2841729
Change-Id: I45a23d3069a8edc49ed6df4abb7187e81a71717b
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-06-24 22:10:19 -07:00
Karthik Anantha Ram
1d59dbe0cb msm: camera: isp: Consolidate common code into a single API
Consolidate checks for scratch buffer config for CDM & AHB
into one API.

CRs-Fixed: 2841729
Change-Id: Icd177a942c257c97a047fe9c0833e9c1cdce7bef
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-06-24 22:09:45 -07:00
Camera Software Integration
a5acc9cc9f Merge "msm: camera: isp: Change SFE RDI acquire for dualcase" into camera-kernel.lnx.5.0 2021-06-24 13:52:08 -07:00
Camera Software Integration
a5ec279fcd Merge "msm: camera: isp: Reset SFE HW clock rate at stream off" into camera-kernel.lnx.5.0 2021-06-24 13:51:53 -07:00
Camera Software Integration
cc535dd8a1 Merge "msm: camera: isp: Add support of new out ports for VFE 780" into camera-kernel.lnx.5.0 2021-06-24 13:51:34 -07:00
Ridhi Shah
dd286cfcec msm: camera: common: add support to override cdm version in presil
Read version and family from device tree if presil enabled.

CRs-Fixed: 2932495
Change-Id: I6a2518c033ee42202ab7ad2beb839aad20679311
Signed-off-by: Suraj Dongre <sdongre@codeaurora.org>
Signed-off-by: ridhshah <ridhshah@codeaurora.org>
2021-06-23 23:24:06 -07:00
Camera Software Integration
3c5e4143ec Merge "msm: camera: tfe: Drop first rdi frame in dual tfe scenario" into camera-kernel.lnx.5.0 2021-06-23 16:22:30 -07:00
Camera Software Integration
aa7b29f27e Merge "msm: camera: cdm: Add cdm debug status register" into camera-kernel.lnx.5.0 2021-06-23 16:22:12 -07:00
Karthik Anantha Ram
ae190c6af9 msm: camera: reqmgr: Add missing spin unlock call
In cam_req_mgr_cb_notify_trigger add missing spin unlock
call. In case of IRQ delays the API returns without invoking
unlock.

CRs-Fixed: 2975974
Change-Id: I1dc87e457b7c6d9d099ddb54d31be8fc2476f360
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-06-23 13:32:23 -07:00
Suraj Dongre
c65c2f10c9 msm: camera: common: memory api for presil hw access
Added declarations for apis used for memory copy to and from presil hw.

CRs-Fixed: 2932495
Change-Id: I19cd272fd4993c68278b3d8cceabe5d9b5d9a5f6
Signed-off-by: Suraj Dongre <sdongre@codeaurora.org>
2021-06-23 10:42:35 -07:00
Suraj Dongre
f460877a7c msm: camera: common: presil hw access headers
Added declarations and stubs for presil hw access apis.

CRs-Fixed: 2932495
Change-Id: Icbb38ca08ded2d8ba6be495ddf64bc1ae6a30245
Signed-off-by: Suraj Dongre <sdongre@codeaurora.org>
2021-06-23 10:42:15 -07:00
Karthik Jayakumar
9e5bc7a1f4 msm: camera: common: Fix dma_attr_t types
Fixes typecasts from dma_attr_t types to uint32_t types for memory
management.

CRs-Fixed: 2948659
Change-Id: Ie3898176195ac508f1a922a5e499e6e33ac8e490
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2021-06-23 10:09:24 -07:00
Jigar Agrawal
33b42a170c msm: camera: csiphy: Add Support for datarate specific settings
Add support for data rate specific bringup register settings
for csiphy for csiphy2.1.0.

CRs-fixed: 2968227
Change-Id: Ide484fe2e94e0e44c75396de719bd2a8010c0eea
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-06-22 15:36:50 -07:00
Karthik Anantha Ram
fa24700f91 msm: camera: isp: Update hw mgr if sys cache is not enabled
As part of enabling sys cache, if SFE hw layer finds that
the user has requested to disable sys cache, return that status
to hw mgr. By doing this we would avoid activating/deactivating
a cache that is not in use.

CRs-Fixed: 2841729
Change-Id: Ie7b6ca35cfe46f06ae6285e212811aad2269b5f6
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-06-22 12:32:44 -07:00
Karthik Anantha Ram
5a1589a3c4 msm: camera: isp: Fix the format measure logging
Currently the actual and expected frame size is being
read interchangeably. The change addresses this and
prints the format measure params correctly.

CRs-Fixed: 2841729
Change-Id: Ie07745f7ec39c06ac54afdaea379749954c7672e
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-06-22 11:23:22 -07:00
Savita Patted
b215805307 Merge "msm: camera: req_mgr: Fix deadlock in ICP driver in close" into camera-kernel.lnx.5.0 2021-06-21 18:39:25 -07:00
Savita Patted
68de607556 Merge "msm: camera: req_mgr: Enhance camera v4l2 subdev shutdown sequence" into camera-kernel.lnx.5.0 2021-06-21 18:38:47 -07:00
Karthik Anantha Ram
9e6ecad633 msm: camera: isp: Reset SFE HW clock rate at stream off
Reset core clock rate when all SFE resources are streamed off.
This will ensure that the new clock rate on the next session
will take affect.

CRs-Fixed: 2841729
Change-Id: I12f039a2abe42c7a6a1bfd6ce9d8d54b23c177dc
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-06-21 18:32:51 -07:00
Savita Patted
af4bcd716a Merge "msm: camera: isp: Fix the assignment of bubble_detected" into camera-kernel.lnx.5.0 2021-06-17 15:26:18 -07:00
Savita Patted
451ab299cb Merge "msm: camera: isp: Make frameheader address 256byte aligned" into camera-kernel.lnx.5.0 2021-06-17 15:25:55 -07:00
Savita Patted
12876b5ea7 Merge "msm: camera: isp: Remove hw version checks from camif" into camera-kernel.lnx.5.0 2021-06-17 15:25:33 -07:00
Savita Patted
960ab09d83 Merge "msm: camera: isp: Avoid possible NOC crash in case of overflow" into camera-kernel.lnx.5.0 2021-06-17 15:24:53 -07:00
Karthik Anantha Ram
45359c12f8 msm: camera: isp: Change epoch line computation
On current target in order to configure epoch to 50% we need
to do sensor total lines by 2 as opposed to by 4 being done
on previous target. The workaround by 4 is not needed since
the issue has been addressed in HW.

CRs-Fixed: 2841729
Change-Id: I81c65c41bbda7e3ba41b9dc8beb81a8853c3f8bf
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-06-17 11:54:40 -07:00
Ravikishore Pampana
3dcb2cb0bd 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-06-17 15:42:45 +05:30
Chandan Kumar Jha
fd65327ebd msm: camera: isp: Add support of new out ports for VFE 780
Add support of new stats out ports in vfe driver for VFE 780.

CRs-Fixed: 2948116
Change-Id: I2d0a13fe90f49b66839ea90b5d9882fd7c6528be
Signed-off-by: Chandan Kumar Jha <cjha@codeaurora.org>
2021-06-17 11:16:59 +05:30
Karthik Anantha Ram
8ae414fda5 msm: camera: isp: Change SFE RDI acquire for dualcase
With recent change in SFE acquire logic, RDI
acquire for dual case was not handled. This change ensures
RDI in case of dualSFE stream is acquired from SFE
of lower index in alignment with CSID.

CRs-Fixed: 2841729
Change-Id: Ie71c34b702a42427172792a5301e3b4ac925fcfe
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-06-16 19:42:31 -07:00
Depeng Shao
2e7c5fcf1b msm: camera: isp: Fix the assignment of bubble_detected
Fix the assignment of bubble_detected.

CRs-Fixed: 2948932
Change-Id: Ie9a289f732d12a0238e643e81c8a5bbdcaca059a
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2021-06-16 01:53:04 -07:00
Gaurav Jindal
042e596c30 msm: camera: isp: Avoid possible NOC crash in case of overflow
In case of path errors, CSID debug registers are printed after sending
the error event to hw manager. In some scenarios, work queue calling the
stop hw can be called before printing the registers. This can cause
NOC errors while accessing the registers.
This commit moves the printing of registers to single location just
before sending the event to hw manager.

CRs-Fixed: 2962255
Change-Id: I929741cbe8211d4b3cb012588ea923ddd2e5a97c
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2021-06-16 10:15:01 +05:30
Karthik Anantha Ram
a5fbb956da msm: camera: isp: Disable/Enable SFE read masters dynamically
For dynamic switch use-cases, disable SFE RMs if they are not
used. Enable them if there is a switch utilizing that RM.
This is the HW recommendation for dynamic switch use-cases.

CRs-Fixed: 2841729
Change-Id: I93732fddced02c4e375635143de3f122f37ef008
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-06-15 09:38:48 -07:00
Karthik Anantha Ram
311380c961 msm: camera: isp: Utility API to update hw map entries
Add a utility API in hw_mgr to update hw map entries for kmd buffer.
The change also addresses KW issues in hw_mgr.

CRs-Fixed: 2841729
Change-Id: Ic3f1bba5fb0057f750d12ff8e29ae0268b0c13b1
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-06-15 00:41:55 -07:00
Camera Software Integration
19d782fd36 Merge "msm: camera: isp: Add support for vertical binning in CSID" into camera-kernel.lnx.5.0 2021-06-10 17:32:46 -07:00
Camera Software Integration
90c43b56e8 Merge "msm: camera: isp: Remove HW restriction on SFE RDI0-2 inputs" into camera-kernel.lnx.5.0 2021-06-10 17:32:27 -07:00
Camera Software Integration
90afbb3e94 Merge "msm: camera: icp: Print lx7 status registers" into camera-kernel.lnx.5.0 2021-06-09 19:16:14 -07:00
Camera Software Integration
b02e40ded7 Merge "msm: camera: isp: Mask process_bubble for SHDR usecase" into camera-kernel.lnx.5.0 2021-06-09 19:15:25 -07:00
Camera Software Integration
69b929466b Merge "msm: camera: common: Multiple fixes for crm redesign" into camera-kernel.lnx.5.0 2021-06-09 19:15:15 -07:00
Camera Software Integration
bc895d1ad5 Merge "msm: camera: req_mgr: Re-design CRM to support multi links in sync mode" into camera-kernel.lnx.5.0 2021-06-09 19:15:05 -07:00
Karthik Anantha Ram
1b89b74b0a msm: camera: isp: Add support for vertical binning in CSID
Add support to obtain hint from userland to enable binning in
either direction. The change updates the existing binning field
in UAPI to provide provision for both vertical & horizontal
binning options.

CRs-Fixed: 2841729
Change-Id: I37958d648ed4387d9e2bff8bcff8ffd39801baa3
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-06-09 10:58:08 -07:00
Savita Patted
b06f482946 Merge "msm: camera: isp: Add new IRQ for CSID 780" into camera-kernel.lnx.5.0 2021-06-08 19:56:38 -07:00
Savita Patted
8c98bdf674 Merge "msm: camera: isp: Add support for CSID 780" into camera-kernel.lnx.5.0 2021-06-08 19:56:15 -07:00
Savita Patted
9f978d74a9 Merge "msm: camera: isp: Add new IRQ for VFE 780" into camera-kernel.lnx.5.0 2021-06-08 19:55:36 -07:00
Karthik Anantha Ram
c357648fcd msm: camera: icp: Print lx7 status registers
If lx7 collapse/resume fails dump status registers to help
narrow down the cause. The change also adds a write barrier
post HOST2ICP trigger.

CRs-Fixed: 2841729
Change-Id: I8201a1c84e0455044fccf88cc86a865bb89356a7
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-06-08 11:31:48 -07:00
Pavan Kumar Chilamkurthi
83d6037d44 msm: camera: cpas: Increase cpas max clients, tree nodes
Increase number of cpas clients macro value and mx number
of tree nodes value to accommodate new clients on v780.

CRs-Fixed: 2948116
Change-Id: I9e3fb0b0a562eb92032405903fe0c30eeacd0dc0
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2021-06-08 00:01:38 -07:00
Tejas Prajapati
1a9a9042d2 msm: camera: ife: pagefault_ops access protected with mutex_lock
Pagefault_ops is protected by the mutex_lock to avoid the
list corruption by concurrent access via flush calls.

CRs-Fixed: 2904307
Change-Id: Ia6519a382ace7b89b6bd59a2dacfeca3c31e2705
Signed-off-by: Tejas Prajapati <tpraja@codeaurora.org>
2021-06-08 11:44:23 +05:30
Savita Patted
97a5608106 Merge "msm: camera: csiphy: Add work queue to trigger the status register" into camera-kernel.lnx.5.0 2021-06-07 18:55:36 -07:00
Savita Patted
afd6884a53 Merge "msm: camera: csiphy: Add debug enhancement for the pattern test" into camera-kernel.lnx.5.0 2021-06-07 18:52:33 -07:00
Savita Patted
be40177131 Merge "msm: camera: csiphy: Add support for enable/disable CSIRX for PRBS9" into camera-kernel.lnx.5.0 2021-06-07 18:52:00 -07:00
Savita Patted
5212a5ea23 Merge "msm: camera: isp: Update pdlib masks for v680 hw" into camera-kernel.lnx.5.0 2021-06-07 18:51:21 -07:00
Savita Patted
23f6977ce5 Merge "msm: camera: util: Fix printing of tag in trace logs" into camera-kernel.lnx.5.0 2021-06-07 18:50:34 -07:00