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

675 Коммитов

Автор SHA1 Сообщение Дата
Haritha Chintalapati
cbfca9ab29 Merge "msm: camera: csiphy: add 1.2.5 version phy for holi camera as per hpg" into camera-kernel.lnx.4.0 2020-07-27 13:39:15 -07:00
Haritha Chintalapati
f91e158abf Merge "msm: camera: req_mgr: Support for 3 links in CRM" into camera-kernel.lnx.4.0 2020-07-27 13:39:06 -07:00
Haritha Chintalapati
fdc5107b5e Merge "msm: camera: sensor: Add error handling when adding request" into camera-kernel.lnx.4.0 2020-07-27 13:38:56 -07:00
Haritha Chintalapati
1eb162cc8f Merge "msm: camera: tfe: Enable TFE and OPE for bengal" into camera-kernel.lnx.4.0 2020-07-27 13:38:20 -07:00
Haritha Chintalapati
79f9e08a6b Merge "msm: camera: csiphy: Fill interrupt size variable" into camera-kernel.lnx.4.0 2020-07-27 13:38:09 -07:00
Haritha Chintalapati
72d728b79b Merge "msm: camera: cci: reset reinit completion on read" into camera-kernel.lnx.4.0 2020-07-27 13:37:54 -07:00
Haritha Chintalapati
9d3a46d91e Merge "msm: camera: jpeg: Add dma driver implementation" into camera-kernel.lnx.4.0 2020-07-27 13:37:45 -07:00
Haritha Chintalapati
82c16fb39a Merge "msm: camera: ife: Optimize the IFE CDM Acquire" into camera-kernel.lnx.4.0 2020-07-27 13:37:12 -07:00
Haritha Chintalapati
b4f8748142 Merge "msm: camera: cci: Fix invalid queue size for cci" into camera-kernel.lnx.4.0 2020-07-27 13:37:01 -07:00
Trishansh Bhardwaj
97eeefea15 msm: camera: tfe: Enable TFE and OPE for bengal
Enable TFE and OPE compilation for bengal target.

CRs-Fixed: 2729996
Change-Id: I648cae32f39a5bf7225c8be545f1c310e24db8e6
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2020-07-23 05:42:11 -07:00
Tony Lijo Jose
4b9521408e msm: camera: csiphy: add 1.2.5 version phy for holi camera as per hpg
Implement PHY settings as per HPG version File name

CRs-Fixed: 2736884
Change-Id: I01949090448d9f8ff691e40ca38a800dbc15f9d5
Signed-off-by: Tony Lijo Jose <tjose@codeaurora.org>
2020-07-22 22:29:35 -07:00
Ayush Kumar
bef2e958a1 msm: camera: req_mgr: Support for 3 links in CRM
Add third link to support 3 concurrent camera in
sync. This change contain support same max pipeline
delay and different max pipeline delay as well.

CRs-Fixed: 2723787
Change-Id: I25e50e8e9a19c4c306a01dd3b700f8a990f3eb66
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2020-07-23 06:13:58 +05:30
Jigarkumar Zala
c1b6545f00 msm: camera: sensor: Add error handling when adding request
Currently proper error handling is not present in case of failure
in adding request to request manager. This change adding proper
result send out to UMD.

CRs-Fixed: 2738448
Change-Id: I7fb54c085ac670c197523e4d7cb416eeb414a2ed
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2020-07-22 16:46:52 -07:00
Camera Software Integration
8c5f76e807 Merge "msm: camera: reqmgr: Defer probe when master is not ready" into camera-kernel.lnx.4.0 2020-07-22 15:36:34 -07:00
Camera Software Integration
bbbf276f27 Merge "Revert "msm: camera: isp: Disable clk gating in IFE top"" into camera-kernel.lnx.4.0 2020-07-22 15:36:00 -07:00
Camera Software Integration
e4bfc2b00f Merge "msm: camera: isp: Added CSID recovery mechanism" into camera-kernel.lnx.4.0 2020-07-22 15:35:37 -07:00
Jigar Agrawal
3f8fc789d9 msm: camera: ife: Optimize the IFE CDM Acquire
Optimize IFE configuration process by making
IFE hw update entries independent of the hw type
(IFE or SFE). Use CPAS-CDM for dualIFE configuration.

CRs-Fixed: 2704472
Change-Id: I1ecba0312c83f0ab1b88c158430650bb9e28666c
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2020-07-21 17:02:06 -07:00
Jigarkumar Zala
92ebf5ad23 msm: camera: csiphy: Fill interrupt size variable
As a part of interrupt status dump, it needs details for number
of register to be read. This change fill the interrupt size
variable to do the correct operation.

CRs-Fixed: 2729624
Change-Id: I9ee97e5a6c495062753fbd0ed44a178908c5109b
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2020-07-21 16:38:31 -07:00
Camera Software Integration
7ea6cea7a7 Merge "msm: camera: reqmgr: Allow requests to be submitted in IDLE state" into camera-kernel.lnx.4.0 2020-07-21 14:50:43 -07:00
Mukund Madhusudan Atre
a7b73974d0 msm: camera: reqmgr: Defer probe when master is not ready
Some sensor drivers that are not slaves to CRM, can probe earlier
than the master bind call. Return EPROBE_DEFER when camera v4l2
root device is not ready.

CRs-Fixed: 2734061
Change-Id: I5a1162f38526fc7f95127b4163183aa66f213d8f
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-07-21 09:37:13 -07:00
Tony Lijo Jose
a6321e50af msm: camera: cci: reset reinit completion on read
Reinit completion rd_done completion variable before each read so that
the rd_done completion variable state will be clean .

CRs-Fixed: 2736884
Change-Id: I2cd7350da8e8270c1cd9238dec0eec9f84360899
Signed-off-by: Tony Lijo Jose <tjose@codeaurora.org>
2020-07-21 21:48:22 +05:30
Tony Lijo Jose
c515d1506d msm: camera: cci: Fix invalid queue size for cci
The queue size of cci hw version 1.2.9 is 64 and 16. Due to wrong
conditional check the cci queue size is assigned wrongly for cci version
1.2.9. This change corrects the cci queue size for cci version 1.2.9.

CRs-Fixed: 2736884
Change-Id: I60508fadec89831f3b877d64631b7da6304c030d
Signed-off-by: Tony Lijo Jose <tjose@codeaurora.org>
2020-07-21 21:24:16 +05:30
Gaurav Jindal
5f7b7386cf msm: camera: isp: Added CSID recovery mechanism
CSID is not able to recover from the fatal errors like lane
overflows, continuous unbound frames or ESD errors. To recover
from such errors, it is necessary to restart the sensor as
just starting the ISP hw do not make any change as the sensor
can still be in bad state.
This commit implements tasklet based CSID recovery mechanism.
On detecting an error in CSID interrupt, tasklet is scheduled
which in turn will call the ISP hw manager to notify the ISP
context, from here a notification is sent to CRM to send a
message to trigger full recovery. This full recovery includes
the sensor release and start.
This feature is debugfs based. Based on need this can be turned
on.

CRs-Fixed: 2642216
Change-Id: Iecf9916d3672d71a1367886cc934b5a2b148f918
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
Signed-off-by: Vishalsingh Hajeri <vhajeri@codeaurora.org>
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-07-20 18:02:12 -07:00
Mukund Madhusudan Atre
db30227d17 Revert "msm: camera: isp: Disable clk gating in IFE top"
This reverts commit 0181a16f13.
The control for disabling clock gating is with cpas. So, this
change has no effect.

CRs-Fixed: 2726688
Change-Id: I74f7d06680d039f8df4e28e8b58d4bd6ad0f650b
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-07-20 14:34:31 -07:00
Camera Software Integration
9b8cae4b7c Merge "msm: camera: sensor: Fix misleading indentation issue" into camera-kernel.lnx.4.0 2020-07-20 13:18:48 -07:00
Suraj Dongre
8210c9c216 msm: camera: jpeg: Add dma driver implementation
Add code to fill register settings and irq handler code
for JPEG DMA.

CRs-Fixed: 2716356
Change-Id: Ib48c5b27e6b29bf935fff3b68a6c74b483ea572c
Signed-off-by: Suraj Dongre <sdongre@codeaurora.org>
2020-07-20 09:18:51 -07:00
Camera Software Integration
431878cfc8 Merge "msm: camera: csiphy: Add support for CPHY dynamic lane configuration" into camera-kernel.lnx.4.0 2020-07-17 18:26:32 -07:00
Karthik Anantha Ram
a358e14888 msm: camera: reqmgr: Allow requests to be submitted in IDLE state
Allow requests to be submitted by UMD and added by devices on
the link, irrespective of the link state.

CRs-Fixed: 2718108
Change-Id: Ie6a6f3576bc6aeb1657ee751dc72779cafec7ffe
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-07-17 13:53:35 -07:00
Camera Software Integration
c8f19704d3 Merge "msm: camera: reqmgr: Update the dma_buf api usage" into camera-kernel.lnx.4.0 2020-07-16 13:26:41 -07:00
Depeng Shao
61575d2c08 msm: camera: sensor: Fix misleading indentation issue
Fix misleading indentation issue.

CRs-Fixed: 2732403
Change-Id: I1f04f0de14ef7c18d669f17842c712f340d093ed
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2020-07-16 08:41:09 +08:00
Camera Software Integration
c83f67df47 Merge "msm: camera: reqmgr: Add notify frame skip interface" into camera-kernel.lnx.4.0 2020-07-15 15:05:01 -07:00
Camera Software Integration
9d1494c482 Merge "msm: camera: cdm: Fix out of bounds issue" into camera-kernel.lnx.4.0 2020-07-15 15:04:52 -07:00
Jigarkumar Zala
af762bc692 msm: camera: csiphy: Add support for CPHY dynamic lane configuration
Add logic to dynamically lane configuration for the CPHY combo
mode, where individual sensor can configure with different datarate
by configuring the respective lanes at the time of configuration.

CRs-Fixed: 2729624
Change-Id: Ie3714f9fd5d24c6cea8824f3a9dd9dc7f6f6d976
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2020-07-15 14:38:40 -07:00
Camera Software Integration
f0380a0ab6 Merge "msm: camera: icp: Poll HFI init response using readl variant" into camera-kernel.lnx.4.0 2020-07-14 16:04:41 -07:00
Camera Software Integration
1ba919a8d1 Merge "msm: camera: isp: Add handle function for RUP in bubble" into camera-kernel.lnx.4.0 2020-07-14 16:04:35 -07:00
Jigarkumar Zala
093fcb7ceb msm: camera: reqmgr: Update the dma_buf api usage
dma_buf_kmap/kunmap is replaced with dma_buf_vmap/vunmap api, to
accommodate upstream driver.

CRs-Fixed: 2732008
Change-Id: Id6551d84ea09d91a18c64fbbca3a796f4eab0bb1
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2020-07-14 11:23:00 -07:00
Depeng Shao
c782e8c3ab msm: camera: reqmgr: Add notify frame skip interface
This change adds support to notify frame skip when CRM
not ready to apply a normal setting. Sensor and custom
device also want to update the HW settings in some
conditions even if a frame is skipped.

CRs-Fixed: 2691642
Change-Id: Ibd2b22655d0f6b6c90663df75a0f5fad8565e918
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2020-07-14 18:45:30 +08:00
Camera Software Integration
cbac6f37f9 Merge "msm: camera: csiphy: Add support for CSIPHY 2.1.0" into camera-kernel.lnx.4.0 2020-07-13 14:53:42 -07:00
Depeng Shao
41ffa1f4f9 msm: camera: cdm: Fix out of bounds issue
The dt match table needs end up with null.

CRs-Fixed: 2730795
Change-Id: I75bdf20d74d9a83d9a0de28a2ad4d95412a51f0c
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2020-07-13 22:00:25 +08:00
Fernando Pacheco
dcb4ee83be msm: camera: icp: Poll HFI init response using readl variant
The extra read seems to have been added due to an incorrect use
of readw_poll_timeout. The readw_poll_timeout was effectively acting
as a long delay before attempting the second read. Replacing the readw
with a readl results in correctly polling the register. We can safely
remove the extra read and simplify the polling logic.

CRs-Fixed: 2722486
Change-Id: I07269d601e64059ce7654563c379b5dc956895b3
Signed-off-by: Fernando Pacheco <fpacheco@codeaurora.org>
2020-07-10 14:35:53 -07:00
Vishalsingh Hajeri
3adf5ea68e msm: camera: isp: Add handle function for RUP in bubble
When we wait on Bufdone for Bubble Request in Bubble state,
We don't know whether the CDM is hung or Bufdone is delayed.
This change prints more information for bubble request to
ascertain CDM is in good state.

CRs-Fixed: 2705745
Change-Id: I98215904b5665281808e775c97c6747a38eb1081
Signed-off-by: Vishalsingh Hajeri <vhajeri@codeaurora.org>
2020-07-10 14:08:39 -07:00
Jigarkumar Zala
402c0a500b msm: camera: req_mgr: Remove unwanted v4l2 operation
CCI hardware is no longer register as device node with v4l2 layer.
At time of notify message, there is missing check to read subdev
name, which cause the null pointer issue. This change removes
the sudbev node reading operation with devnode pointer as it is
not being use anywhere in functionality.

CRs-Fixed: 2702760, 2727771
Change-Id: Id362bd2edf4eea35f05115ae3a5b6c1d761bb437
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2020-07-09 09:37:47 -07:00
Jigar Agrawal
cd675940d7 msm: camera: csiphy: Add support for CSIPHY 2.1.0
Add support for new CSIPHY version 2.1.0. Add hw
register file for CSIPHY 2.1.0.

CRs-Fixed: 2724449
Change-Id: Id3f21b4f60e807ca6fef762f0c6da193ae78e099
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2020-07-08 17:52:41 -07:00
Camera Software Integration
f4fbab5083 Merge "msm: camera: common: Return appropriate error code for cancelled requests" into camera-kernel.lnx.4.0 2020-07-08 12:20:07 -07:00
Camera Software Integration
12c93f36e4 Merge "msm: camera: isp: Only RDI path can access RDI resource" into camera-kernel.lnx.4.0 2020-07-08 12:19:56 -07:00
Camera Software Integration
e3e118457a Merge "msm: camera: csiphy: Update logic for lane enablement" into camera-kernel.lnx.4.0 2020-07-07 17:56:13 -07:00
Camera Software Integration
c29fcea3e2 Merge "msm: camera: ife: Improve IFE logs for better debugging" into camera-kernel.lnx.4.0 2020-07-07 17:56:02 -07:00
Camera Software Integration
37eb5e1921 Merge "msm: camera: utils: Add final BW vote logs as perf logs" into camera-kernel.lnx.4.0 2020-07-07 17:55:55 -07:00
Camera Software Integration
117275870d Merge "msm: camera: cci: Fix incorrect use of cci config ioctl" into camera-kernel.lnx.4.0 2020-07-07 17:55:49 -07:00
Camera Software Integration
fb8c7dbeb3 Merge "msm: camera: common: Enable debugfs compile check" into camera-kernel.lnx.4.0 2020-07-07 17:55:41 -07:00