Commit Graph

1828 Commits

Author SHA1 Message Date
Haritha Chintalapati
ed9a69cf4b Merge "msm: camera: csiphy: Rearrange csiphy debugfs" into camera-kernel.lnx.5.0 2021-07-27 22:08:33 -07:00
Camera Software Integration
13670c580a Merge "msm: camera: reqmgr: Correct condition check" into camera-kernel.lnx.5.0 2021-07-26 17:33:06 -07:00
Camera Software Integration
c836ea502b Merge "msm: camera: jpeg: Update jpeg traces" into camera-kernel.lnx.5.0 2021-07-26 17:32:55 -07:00
Savita Patted
57ba0757b7 Merge "msm: camera: isp: Add support of SFE HW for v780" into camera-kernel.lnx.5.0 2021-07-23 19:19:20 -07:00
Jigar Agrawal
57b1d69e64 msm: camera: csiphy: Rearrange csiphy debugfs
Currently all the csiphy debugfs entries are
populated in the same camera-csiphy folder.
This has make searching for a desired debugfs
for desired csiphy a little difficult. Move
all those debugfs entries to the respective
csiphy index directory for easy access.

CRs-fixed: 2992807
Change-Id: Ia48df672669c88a0dd72f051a7be3d8e043c7e7c
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-07-23 11:52:50 -07:00
Savita Patted
b9abb71726 Merge "msm: camera: cpas: Add support for SmartQoS feature" into camera-kernel.lnx.5.0 2021-07-22 22:15:33 -07:00
Karthik Anantha Ram
5f13fe864f msm: camera: reqmgr: Correct condition check
Flag warning only if the wait call returns 0.

CRs-Fixed: 2841729
Change-Id: I456da8a66ea69bcf671f55bd5f0459aab74476f5
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-07-22 19:24:05 -07:00
Chandan Kumar Jha
1c1d221ff7 msm: camera: isp: Add support of SFE HW for v780
Add support for SFE 780. Register header files are updated.

This change also includes  new IRQ and port for SFE 780 along
with some debug enhancement.

CRs-Fixed: 2948116
Change-Id: I3e83ad275212fd73e1ce9dce0dc18970ff036351
Signed-off-by: Chandan Kumar Jha <cjha@codeaurora.org>
2021-07-22 13:56:58 +05:30
Savita Patted
017b2667e9 Merge "msm: camera: csiphy: Continue in case of unavailibility of CSIPHY hw" into camera-kernel.lnx.5.0 2021-07-21 22:29:40 -07:00
Savita Patted
5acb10a298 Merge "msm: camera: csiphy: Add missing base address assignment" into camera-kernel.lnx.5.0 2021-07-21 22:29:24 -07:00
Savita Patted
3dd2620d85 Merge "msm: camera: isp: Add support for flush in offline IFE" into camera-kernel.lnx.5.0 2021-07-21 22:29:05 -07:00
Savita Patted
b1f464eec7 Merge "msm: camera: utils: Reduce performance impact of printing logs" into camera-kernel.lnx.5.0 2021-07-21 22:28:47 -07:00
Savita Patted
8c17ac8865 Merge "msm: camera: isp: IFE and CSID probe based on fuse" into camera-kernel.lnx.5.0 2021-07-21 22:28:26 -07:00
Savita Patted
5adfe2913e Merge "msm: camera: icp: Add safety checks for IPE/BPS" into camera-kernel.lnx.5.0 2021-07-21 22:28:05 -07:00
Camera Software Integration
a770a6af1e Merge "msm: camera: isp: Reset CSID top wrapper config" into camera-kernel.lnx.5.0 2021-07-20 17:33:18 -07:00
Camera Software Integration
3c8aa5c0e1 Merge "msm: camera: cpas: Change to set OT value to 8 for RT block" into camera-kernel.lnx.5.0 2021-07-20 17:32:55 -07:00
Camera Software Integration
0087db80cc Merge "msm: camera: cre: Updated FE/WE configuration" into camera-kernel.lnx.5.0 2021-07-20 17:32:44 -07:00
Camera Software Integration
b7992805e3 Merge "msm: camera: jpeg: Handle JPEG smmu fault with pid info" into camera-kernel.lnx.5.0 2021-07-20 17:32:21 -07:00
Anand Ravi
0f4ad175a0 msm: camera: utils: Reduce performance impact of printing logs
When debug module is disabled for printing, check it at the site of the
print call instead of inside the print function to increase performance.
Also use a custom print function instead of pr_info to redirect the
same variadic arguments to trace logs to avoid calling two different
variadic functions.

CRs-Fixed: 2989605
Change-Id: Iad9f77ec9fd072bcd371de014e8a976a4e798d90
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-07-19 18:55:45 -07:00
Camera Software Integration
5daf7da643 Merge "msm: camera: mem_mgr: Fix expanded memory allocations" into camera-kernel.lnx.5.0 2021-07-19 17:27:02 -07:00
Karthik Anantha Ram
97719779bc msm: camera: isp: Reset CSID top wrapper config
CSID wrapper config can be reset only by ares from
camera subsystem power up or ares assert BIT in
CSID clk branch both of which are not gauranteed at
the end of a given CSID stream. This change explicitly
resets the wrapper config via AHB. This is to avoid
any 2 CSID wrapper path config registers ending up with the
same config at a given instance.

CRs-Fixed: 2991630
Change-Id: I7b623841b33cad4e3921d0128f323dcd36e485c8
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-07-19 09:48:19 -07:00
Anand Ravi
25ee65107a msm: camera: isp: Add support for flush in offline IFE
Add flush device ioctl handler in ISP top state machine to translate
the flush command into equivalent CRM flush request command. Also add
support for flushing offline IFE workqueue.

CRs-Fixed: 2939523
Change-Id: I79a6b6bca241b954e06f78e8a05e55907f46aa59
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-07-19 09:02:49 -07:00
Wyes Karny
5f7956594d msm: camera: isp: IFE and CSID probe based on fuse
Some ISP hardware id instances are disabled on some target skus.
Cpas driver has fuse information based on the dtsi entries.
ISP hw driver queries the cpas driver whether hw instance is
supported or not. If ISP hardware is supported on the target then
continue the isp hardware probe.

Fix for get HW feature:
When feature is enable or disable type and HW mask is not indicating the
HW index, do not update the supported. By default it is supported.

CRs-Fixed: 2825675
Change-Id: I777e5790060388458562e7a53fea8a7324ffa9d3
Signed-off-by: Wyes Karny <wkarny@codeaurora.org>
2021-07-18 22:05:40 -07:00
Vikram Sharma
ffc9bf8758 msm: camera: cre: Updated FE/WE configuration
Changed from static to dynamic allocation for hw_mgr_intf.
Updated de-init handling during driver remove.
Updated Idle irq handling to not clear request data at idle irq.
Multiple request handling at buff done.
Offset fix.

CRs-Fixed: 2982472
Change-Id: I37fb690f9f4c1460ecf322a259e2e1001574339b
Signed-off-by: Vikram Sharma <vikramsa@codeaurora.org>
2021-07-18 21:30:56 -07:00
Ayush Kumar
51f4e0b008 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 Yiupik camera. This is sw workaround for Yupik camera.

CRs-Fixed: 2924987
Change-Id: Icb7f30c23f5899558a41308fe313d46fd8d992a3
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2021-07-18 06:35:30 -07:00
Camera Software Integration
16710c7458 Merge "msm: camera: isp: Add support for AEB use-case" into camera-kernel.lnx.5.0 2021-07-16 19:49:16 -07:00
Camera Software Integration
400bbd856d Merge "msm: camera: csiphy: Update csiphy2.1.0 bringup sequence" into camera-kernel.lnx.5.0 2021-07-16 19:49:05 -07:00
Camera Software Integration
3ec4a1fd7e Merge "msm: camera: common: Append timestamp in INFO LOGS" into camera-kernel.lnx.5.0 2021-07-16 19:48:48 -07:00
Camera Software Integration
16520dd02f Merge "msm: camera: req_mgr: Fix request mismatch on slave bubble" into camera-kernel.lnx.5.0 2021-07-16 19:48:38 -07:00
Camera Software Integration
399abd9ccd Merge "msm: camera: csiphy: Handle the aon/non_aon configuration" into camera-kernel.lnx.5.0 2021-07-16 19:48:25 -07:00
Camera Software Integration
aec4d21661 Merge "msm: camera: cpas: Program safe_lut for ife pdaf port" into camera-kernel.lnx.5.0 2021-07-16 19:47:31 -07:00
Camera Software Integration
99af90b2e5 Merge "msm: camera: isp: Change log from warn to DBG" into camera-kernel.lnx.5.0 2021-07-16 19:47:20 -07:00
Pavan Kumar Chilamkurthi
458f4844b4 msm: camera: jpeg: Update jpeg traces
Add trace log at DMA bufdone IRQ.  Update jpeg ENC traces
with more info.

CRs-Fixed: 2993654
Change-Id: I85e0ea312188780c6756a3d8d71dc35995791541
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2021-07-16 10:56:34 -07:00
Karthik Jayakumar
9122c82fe1 msm: camera: mem_mgr: Fix expanded memory allocations
Fixes expanded memory allocations to only happen for ICP context banks.
Re-maps the command buffers to shared region of ICP context bank.

CRs-Fixed: 2985358
Change-Id: I3c2d5866b0041489577f6c5c0ec113c886437107
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2021-07-15 13:14:59 -07:00
Sokchetra Eung
5a11ba0725 msm: camera: common: Append timestamp in INFO LOGS
Use Kernel time to obtain the current time when IFE is acquired
/released and when sensor is streamed on/off. Convert the Ktime
to a timestamp format and log it in existing info prints. This
will help to co-relate timestamp between user-space and kernel
logs. The change also replaces the current usage of direct calls
to ktime_get_real_ts64 with macro across all drivers.

CRs-Fixed: 2987320
Change-Id: I87c4790164d222fc1ed6ff41ad00eeb1ed8c8867
Signed-off-by: Sokchetra Eung <eung@codeaurora.org>
2021-07-15 11:56:33 -07:00
Jigar Agrawal
e1205760ac msm: camera: csiphy: Update csiphy2.1.0 bringup sequence
Update csiphy2.1.0 reset sequence to not relese the reset
during the reset sequence. Add support to read cphy lane
status register after programming the csiphy. Program
datarate specific settings before programming the lane
registers. Add a delay of 100us before and 1ms after
releasing the csiphy reset respectively for cphy.

CRs-fixed: 2947752
Change-Id: I4befa03bab85779749efd33908ab5a02c96c0cb4
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-07-15 10:49:41 -07:00
Ayush Kumar
c834473607 msm: camera: req_mgr: Fix request mismatch on slave bubble
Correct number of apply to skip for master in case of slave bubble.
Add log to check and print time left to apply.

CRs-Fixed: 2968652
Change-Id: I7698b79a6d98637726e528f3e40dda4b68118d50
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2021-07-14 21:35:36 -07:00
Camera Software Integration
823a276cb2 Merge "msm: camera: isp: Add safety checks for SFE handling" into camera-kernel.lnx.5.0 2021-07-14 21:24:19 -07:00
Camera Software Integration
84cc0b8677 Merge "msm: camera: isp: Handle ePCR for SFE sHDR/FS usecases" into camera-kernel.lnx.5.0 2021-07-14 21:24:06 -07:00
Camera Software Integration
f2ab5b0cbd Merge "msm: camera: isp: Add support to configure offset dynamically" into camera-kernel.lnx.5.0 2021-07-14 21:23:52 -07:00
Camera Software Integration
3c599ca616 Merge "msm: camera: smmu: Use dmabuf inode num as unique identifier" into camera-kernel.lnx.5.0 2021-07-14 21:23:39 -07:00
Jigarkumar Zala
470bd6c419 msm: camera: csiphy: Continue in case of unavailibility of CSIPHY hw
During the common control register programming across csiphy hws,
there can be chance that number of CSIPHY hw supported is differnt
than max csiphy hw supported among various targets. This change
make sure to continue to next available hardware index in case of
unavailibility of csiphy hw soc index.

CRs-Fixed: 2991847
Change-Id: I1572974226701dcd3aadeb3d9cf95924e05520a9
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2021-07-14 17:40:12 -07:00
Jigarkumar Zala
4492cfd331 msm: camera: csiphy: Add missing base address assignment
Adding base address assignement while reading the status registers
in case of PN9 pattern recieve incorrectly. Without this assignment
there will be null pointer dereferncing issue.

CRs-Fixed: 2991847
Change-Id: I36b21f52e437807efab26a00c961ebbf11f8ded7
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2021-07-14 17:35:52 -07:00
Karthik Anantha Ram
09c8ca0a28 msm: camera: icp: Add safety checks for IPE/BPS
Starting Waipio the FW region is stage 2 only,
as part of the dump IOCTL return success for lx7 since
the FW memory cannot be dumped in HLOS. Also ensure
IPE/BPS reset/PC/resume is done only if IPE/BPS cores
are powered on.

CRs-Fixed: 2841729
Change-Id: I61df98f9740410f2b5a9fee6142572715a391583
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-07-14 16:48:15 -07:00
Karthik Anantha Ram
5d5b3a5144 msm: camera: isp: Add support for AEB use-case
Add support to ensure epoch is programmed post second
exposure frame. Validate this, if this check fails
flag an error. The % factor of frame height to be configured
for epoch is obtained from userspace. This % factor will
depend on how the frame is spread for IFE to process.

CRs-Fixed: 2986303
Change-Id: I2d7d34ccdfde0192ebb73bbd920a4c738bbf9ca2
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-07-14 10:57:31 -07:00
Camera Software Integration
de3cbde241 Merge "msm: camera: isp: Add mutex while disabling rx" into camera-kernel.lnx.5.0 2021-07-13 21:26:56 -07:00
Camera Software Integration
3fdabd928f Merge "msm: camera: isp: Reset csid error irq count on flush" into camera-kernel.lnx.5.0 2021-07-13 21:26:24 -07:00
Karthik Anantha Ram
72f753f6a8 msm: camera: isp: Add safety checks for SFE handling
Add checks to avoid KW issues for SFE scratch buffer handling.
Also add check in SFE acquire such that no two streams can
acquire same SFE HW. Update ctx pointer in sfe top struct as
opposed to per path since SFE top will handle for all paths.

CRs-Fixed: 2841729
Change-Id: I9ebbfb54c8be38ca7d2ac223f5fb432bf3307ddd
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-07-12 18:54:42 -07:00
Karthik Anantha Ram
c87a5b914c msm: camera: isp: Handle ePCR for SFE sHDR/FS usecases
In case of ePCR there is no need to append scratch buffer
in INIT request. This change programs scratch via AHB only
for non ePCR streams.

CRs-Fixed: 2841729
Change-Id: Ib9addfc6e5e7270c0ac02d769aa3602feb1f98cf
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-07-12 18:46:19 -07:00
Karthik Anantha Ram
9183cddb79 msm: camera: isp: Add support to configure offset dynamically
Add support to configure image address offset dynamically for
SFE RMs and WMs. For SFE RM use existing WM blob to get this info.

CRs-Fixed: 2841729
Change-Id: I2d9784380b43fd202037bf664e71b89cfc1aba71
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-07-12 18:40:27 -07:00