Commit Graph

1804 Commits

Author SHA1 Message Date
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
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
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
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
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
Karthik Anantha Ram
ba2400d195 msm: camera: isp: Change log from warn to DBG
Change stride alignment warning to debug to avoid
excessive logging.

CRs-Fixed: 2987164
Change-Id: Ib16820f6a9deb76084be94705b09b0627e613446
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-07-12 15:55:12 -07:00
Pavan Kumar Chilamkurthi
89d50926c5 msm: camera: smmu: Use dmabuf inode num as unique identifier
'fd' can be closed in user mode driver, though corresponding
dmabuf is still not freed if someone still holding a refCount
on that dmabuf, say camera smmu driver holding a refCOunt and
has that in its mapping info table. Then the same 'fd' can be
allotted for a different buffer in a new allocation. In such
cases, if we use 'fd' as identifier in camera smmu driver to
check if the buffer is already mapped based on mapping info
table, we mistakenly think the new buffer is already mapped
which is not the case. DMA buf's inode num is an unique
identifier that represents a buffer. Use this along with 'fd'
in camera smmu driver to see if the given buffer is already mapped.

CRs-Fixed: 2961136
Change-Id: I5baac99e3badaca3a376ecd724a7a7aa6da112a4
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2021-07-12 14:01:19 -07:00
Gaurav Jindal
eab943de93 msm: camera: isp: Add mutex while disabling rx
Disbaling RX in CSID during flush is not inside mutex lock.
This can result in damaging the lists and variables causing
stability issues.
This commit moves this call inside mutex lock. Also, a warn log
is added to inform if the flush call times out.

CRs-Fixed: 2974631
Change-Id: I50082c03bebacc4a11f826bdb318c52dbf5400e7
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2021-07-12 20:22:22 +05:30
Ravikishore Pampana
72a587b0fd msm: camera: jpeg: Handle JPEG smmu fault with pid info
Kernel apis provide information fault caused pid and mid data.
Handle the JPEG smmu fault using pid and mid
data. Based on the mid data, dump only corresponding port
info which caused the fault. Pid and mid values are target
dependent, these values will be updated on the jpeg node
dt entries.

CRs-Fixed: 2878371
Change-Id: I0d2d1e474d4662707d85efd022ccce87e67f0d93
Signed-off-by: Ravikishore Pampana <rpampana@codeaurora.org>
2021-07-11 15:51:59 +05:30
Camera Software Integration
fbc548b838 Merge "msm: camera: isp: Add support for clk bw update on config" into camera-kernel.lnx.5.0 2021-07-09 18:53:56 -07:00
Camera Software Integration
614dabb85f Merge "msm: camera: uapi: Add new IFE blob and update feature flag" into camera-kernel.lnx.5.0 2021-07-09 18:53:44 -07:00
Camera Software Integration
8bb1a5d505 Merge "msm: camera: isp: Add fixes for vfe and vfe lite 680 header" into camera-kernel.lnx.5.0 2021-07-09 18:53:26 -07:00
Savita Patted
769d026c3a Merge "msm: camera: memmgr: Add support for non pix secure buffers" into camera-kernel.lnx.5.0 2021-07-08 18:59:30 -07:00
Savita Patted
925d649642 Merge "msm: camera: isp: Remove reprogramming of CSID registers" into camera-kernel.lnx.5.0 2021-07-08 18:59:08 -07:00
Savita Patted
2a0bfd21f9 Merge "msm: camera: tfe: Updated bus acquire logic for new ports added in Mimas 2.0" into camera-kernel.lnx.5.0 2021-07-08 18:58:48 -07:00
Savita Patted
52e77afbfc Merge "msm: camera: cpas: Update QoS settings for IPE in v680 hw" into camera-kernel.lnx.5.0 2021-07-08 18:58:09 -07:00
Savita Patted
ffa01440ef Merge "msm: camera: sensor: Optimize OIS qtimer values" into camera-kernel.lnx.5.0 2021-07-08 18:57:19 -07:00
Savita Patted
a1aaafe948 Merge "msm: camera: isp: Change logic of acquiring dual composite group" into camera-kernel.lnx.5.0 2021-07-08 18:56:51 -07:00
Savita Patted
2149b3d386 Merge "msm: camera: isp: Dont enable Wm configurations during HW start" into camera-kernel.lnx.5.0 2021-07-08 18:56:05 -07:00
Savita Patted
a1e328751b Merge "msm: camera: core: v780 enhanced memory addresses" into camera-kernel.lnx.5.0 2021-07-08 13:23:13 -07:00
Savita Patted
44d4c40b5f Merge "msm: camera: req_mgr: Increase in_q rdx index in workqueue" into camera-kernel.lnx.5.0 2021-07-08 13:22:32 -07:00
Mukund Madhusudan Atre
fc00541bb9 msm: camera: isp: Add support for clk bw update on config
Move clock update call from prepare to config. Add delay
in clock reduction and enable src clock update only when blob
is received. Optimize bw update and combine application of
clock and bw in ife and sfe. Finish update will be common for
clock and bw update, and will be called once per acquired hw.

CRs-Fixed: 2841729
Change-Id: Ideb8e8cfe6838bb9d5c861fb6b7cbc5e499ebee5
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-07-08 08:45:10 -07:00
Ayush Kumar
076ae1c12c 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-07-08 06:33:54 -07:00
Pavan Kumar Chilamkurthi
97fbf8e17f msm: camera: cpas: Program safe_lut for ife pdaf port
Enable programming safe_lut value for pdaf port and write
value as per systems recommendation.

CRs-Fixed: 2986641
Change-Id: I0405fc1f0c5548a50814bab28f7a7d4cbb924730
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2021-07-08 01:13:02 -07:00
Karthik Anantha Ram
8a6b9bd10b msm: camera: uapi: Add new IFE blob and update feature flag
Add new BIT fields for IFE feature flag to indicate custom AEB
mode/shdr mode. Also add support to obtain epoch factor from
userland.

CRs-Fixed: 2986303
Change-Id: I1593b3ac3d1ace660bf58f2185f35e7f9986681c
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-07-07 12:40:32 -07:00
Mukund Madhusudan Atre
c293125d30 msm: camera: isp: Add fixes for vfe and vfe lite 680 header
Update mid values for vfe and vfe lite ports to match with spec.
Remove incorrect input frameheader config offset.

CRs-Fixed: 2841729
Change-Id: I8dc0af8ef40e645b3c38272bb4ed2f82974f48e1
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-07-07 11:37:31 -07:00
Mukund Madhusudan Atre
79fbddd465 msm: camera: cpas: Update QoS settings for IPE in v680 hw
Disable CAMNoC shaper settings for IPE OT.

CRs-Fixed: 2841729
Change-Id: Id363fbfce391e95b4a2f0e99b0d2fab62495f2e0
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-07-07 09:59:30 -07:00
Savita Patted
b7ff0db8c6 Merge "msm: camera: csiphy: Add support for runtime update of csiphy register" into camera-kernel.lnx.5.0 2021-07-07 09:55:19 -07:00