Commit Graph

1543 Commits

Author SHA1 Message Date
Karthik Anantha Ram
997629bcb8 msm: camera: isp: Change SFE acquire logic
There are only 2 SFE cores that can connect to 3 FULL CSIDs.
In addition to this it's possible to have concurrent QCFA & sHDR
pipelines. To accommodate such use-cases try acquiring SFE
of higher index for QCFA use-cases and start from SFE0 for fetch
engine based use-cases. In case of dualSFE assign SFE of lower
index to master CSID.

CRs-Fixed: 2841729
Change-Id: I35f23a52f81e97a974b8670da60dc9dbc6ef144f
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-06-02 13:52:39 -07:00
Camera Software Integration
4eb55453f1 Merge "msm: camera: reqmgr: Correct the count decrement logic" into camera-kernel.lnx.5.0 2021-06-02 12:07:26 -07:00
Camera Software Integration
80f937e481 Merge "msm: camera: isp: Add support for BW limiter" into camera-kernel.lnx.5.0 2021-05-27 16:35:26 -07:00
Camera Software Integration
77e9b35bc7 Merge "msm: camera: reqmgr: Reset the slot if it is applied" into camera-kernel.lnx.5.0 2021-05-27 16:35:08 -07:00
Camera Software Integration
f37c5b5a11 Merge "msm: camera: cre: update image address correctly for 36bit iova" into camera-kernel.lnx.5.0 2021-05-27 16:34:59 -07:00
Camera Software Integration
07d1d19125 Merge "msm: camera: isp: Check ife out res validity" into camera-kernel.lnx.5.0 2021-05-26 15:37:47 -07:00
Karthik Anantha Ram
8dc42065be msm: camera: isp: Add support for BW limiter
Add blob to allow userland to configure BW limter for IFE/SFE
WMs. Deprecate usage of BW limiter field in UBWC blob.

CRs-Fixed: 2841729
Change-Id: Id39414e2a6f9e9f9f4ae33aa245f3ab6f3ad0f45
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-05-26 09:44:39 -07:00
Vikram Sharma
5ca9544430 msm: camera: cre: update image address correctly for 36bit iova
This change upadates the image address programming for 36bit
iova, both on read and write engine.

CRs-Fixed: 2893978
Change-Id: I37f556191b840ba794e7373d9aea5831dc90ab1b
Signed-off-by: Vikram Sharma <vikramsa@codeaurora.org>
2021-05-25 21:50:21 -07:00
Savita Patted
1d59084345 Merge "msm: camera: cre: Add batch support in CRE" into camera-kernel.lnx.5.0 2021-05-25 19:05:36 -07:00
Depeng Shao
2d0124f109 msm: camera: reqmgr: Reset the slot if it is applied
This change reset the slot when the next req is applied, it
should be caused by some exception before, we need to reset
this slot in case we applied wrong req to sub devices.

CRs-Fixed: 2949657
Change-Id: I0b5f7b1d8450ed355701090b185812fb7a6b6e06
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2021-05-26 09:42:13 +08:00
Jigar Agrawal
1559a4b3dd msm: camera: reqmgr: Correct the count decrement logic
Correct the open requests count decrement logic.
Open request count decrements even when there is
no requests in the higher Pipeline_delay devices,
making the open request count negative.

CRs-Fixed: 2912147
Change-Id: If2d72f59a96290a2ccff59665af323da4329f9f4
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-05-25 16:04:12 -07:00
Camera Software Integration
469372865d Merge "msm: camera: isp: Unsubscribe for discard frame trigger in bh" into camera-kernel.lnx.5.0 2021-05-24 19:52:43 -07:00
Vikram Sharma
c8d5a2827f 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/issues.

CRs-Fixed: 2915741
Change-Id: I8722b2a4e2634bda42f0080e00bf09050bbd6b91
Signed-off-by: Vikram Sharma <vikramsa@codeaurora.org>
2021-05-24 10:56:46 -07:00
Camera Software Integration
ee9ba1b583 Merge "msm: camera: isp: Update the reported_req_id correctly" into camera-kernel.lnx.5.0 2021-05-21 18:44:44 -07:00
Camera Software Integration
dc93f615f8 Merge "msm: camera: isp: Change module tag in IFE bus log" into camera-kernel.lnx.5.0 2021-05-21 18:44:27 -07:00
Karthik Anantha Ram
2bd790e7d7 msm: camera: isp: Unsubscribe for discard frame trigger in bh
Avoid unsubscribing for discard trigger irq in th, which leads
to freeing evt_handler structure resulting in usage of a
dangling pointer thereafter in top half.

CRs-Fixed: 2841729
Change-Id: I93e600ba32524c2df563c03b18819cb636b48826
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-05-21 14:41:39 -07:00
Depeng Shao
abf580c09c 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-05-19 22:27:37 -07:00
Vikram Sharma
ecf0d0de02 msm: camera: cre: Add batch support in CRE
This change adds the batch mode support in CRE

CRs-Fixed: 2893978
Change-Id: I9a8f9f1f2f555bc875b3d48485b4458a825dbdbd
Signed-off-by: Vikram Sharma <vikramsa@codeaurora.org>
2021-05-19 21:20:37 -07:00
Haritha Chintalapati
3b517e500a Merge "msm: camera: isp: Configure RX before issuing start command" into camera-kernel.lnx.5.0 2021-05-19 18:19:02 -07:00
Haritha Chintalapati
d0b9221ad8 Merge "msm: camera: isp: Do not reset Rx register during disable decoder" into camera-kernel.lnx.5.0 2021-05-19 18:18:46 -07:00
Haritha Chintalapati
3d252948c1 Merge "msm: camera: csiphy: Correct tag for programming lane enable" into camera-kernel.lnx.5.0 2021-05-19 18:18:35 -07:00
Haritha Chintalapati
1617f08acf Merge "msm: camera: csiphy: Dump PHY Status Registers" into camera-kernel.lnx.5.0 2021-05-19 18:18:25 -07:00
Haritha Chintalapati
14beba2b6a Merge "msm: camera: csiphy: Update the bringup sequence" into camera-kernel.lnx.5.0 2021-05-19 18:18:13 -07:00
Haritha Chintalapati
dfa3a31d87 Merge "msm: camera: csiphy: Cleanup unused variables in csiphy" into camera-kernel.lnx.5.0 2021-05-19 18:17:59 -07:00
Haritha Chintalapati
de04aae87b Merge "msm: camera: sensor: Initialize list head" into camera-kernel.lnx.5.0 2021-05-19 18:17:47 -07:00
Haritha Chintalapati
f4d36c1591 Merge "msm: camera: isp: Add SFE core idx in CSID error notify" into camera-kernel.lnx.5.0 2021-05-19 18:17:34 -07:00
Karthik Anantha Ram
bb3922ce93 msm: camera: isp: Change module tag in IFE bus log
Change module tag from SFE to ISP in IFE bus file.
Also update error code to success for bus debug config.

CRs-Fixed: 2841729
Change-Id: I0c648aeef2864cd55a0940c73235087c7de9d910
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-05-19 12:59:10 -07:00
Haritha Chintalapati
9403d67af9 Merge "msm: camera: isp: Modify check for multi vc-dt" into camera-kernel.lnx.5.0 2021-05-18 19:31:11 -07:00
Haritha Chintalapati
0cb5b301c9 Merge "msm: camera: isp: Force all IFE/SFE RDIs to line based mode" into camera-kernel.lnx.5.0 2021-05-18 19:30:59 -07:00
Haritha Chintalapati
305939800d Merge "msm: camera: cre: unit test fixes" into camera-kernel.lnx.5.0 2021-05-18 19:30:39 -07:00
Anand Ravi
fcc85e1bb2 msm: camera: isp: Configure RX before issuing start command
Prevent potential errors on starting path after flush by issuing start
command after configuring RX.

CRs-Fixed: 2846451
Change-Id: Ib72fc9f0b8397f360f5bed73379ec65310cdc609
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-05-18 14:44:42 -07:00
Gaurav Jindal
3f42dc6055 msm: camera: isp: Do not reset Rx register during disable decoder
During disabling the CSI2, do not reset the rx registers to 0.
This can result in random behaviors if the phy is streaming.
Just disable the IRQs and let the stream off call handle the
reset part.

CRs-Fixed: 2946879
Change-Id: I936ea4026c72033a665958281d7f07751b4ae708
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2021-05-18 15:55:27 +05:30
Haritha Chintalapati
0b6491cf0e Merge "msm: camera: isp: Add state check in CSID driver" into camera-kernel.lnx.5.0 2021-05-17 21:08:35 -07:00
Haritha Chintalapati
aa1afed6a0 Merge "msm: camera: cpas: fix for Shima-CAMNOC RDI latency buffer corruption" into camera-kernel.lnx.5.0 2021-05-17 21:08:30 -07:00
Haritha Chintalapati
0b2fea9e18 Merge "msm: camera: isp: Add 128 bit width support for RDI WM" into camera-kernel.lnx.5.0 2021-05-17 21:08:25 -07:00
Vikram Sharma
455abec717 msm: camera: cre: unit test fixes
Fixes for the issues found in Unit testing of CRE.

CRs-Fixed: 2893978
Change-Id: I7b8061cf2fd4693bde084a003bc101be1cbde1d1
Signed-off-by: Vikram Sharma <vikramsa@codeaurora.org>
2021-05-17 01:13:41 -07:00
Karthik Anantha Ram
7f6ac037d5 msm: camera: isp: Modify check for multi vc-dt
Modify check for multi vc-dt. The change also programs the
right value for dynamic switch select.

CRs-Fixed: 2841729
Change-Id: I9b7459f77d65a83f3d559967a04d81357f7c6de3
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-05-15 18:47:37 -07:00
Karthik Anantha Ram
cf25a62ef5 msm: camera: isp: Force all IFE/SFE RDIs to line based mode
Change mode of all RDI WMs to line based mode to account for
SFE ZSL RAW 80 byte stride alignment. This change is to make
it generic for all RAW outputs. If the mode needs to be made
frame based, userland will override it.

CRs-Fixed: 2841729
Change-Id: I87705c2b035df905d76fbbe80e170991c2230135
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-05-15 18:45:38 -07:00
Haritha Chintalapati
32b6adfc86 Merge "msm: camera: isp: Reset device enabled during CSID stop" into camera-kernel.lnx.5.0 2021-05-14 19:38:42 -07:00
Jigarkumar Zala
ddb022b1fa msm: camera: csiphy: Correct tag for programming lane enable
Lane enable needs to be program with header tag LANE_ENABLE. This
change adds the tag associated with the correct register offset.

CRs-Fixed: 2929063
Change-Id: Ibbb8e4e0fc2d2de8e9c9f193b3d31ba5492b22f4
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2021-05-14 16:53:51 -07:00
Jigar Agrawal
bbb5baee0a msm: camera: csiphy: Dump PHY Status Registers
Add support to dump the 3ph and 2ph specific
status registers. Following debugfs command can
be used to enable status register dump for csiphy0:
adb shell
  "echo 1>/sys/kernel/debug/camera_csiphy/csiphy0_en_status_reg_dump"

CRs-Fixed: 2942364
Change-Id: If8d57a9e54c9e509de35f6a57d7baa1895be7779
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-05-14 16:46:18 -07:00
Karthik Anantha Ram
2053cf1569 msm: camera: isp: Add SFE core idx in CSID error notify
It's possible that for a given use-case the pipeline is
CSID2->SFE0->IFE2, in the event of an overflow we need to log
the right SFE's debug registers. Unlike IFE we cannot use
CSID hw_idx to find the SFE core in the pipeline. The change
ensures we log the connected SFE core's debug registers.

CRs-Fixed: 2841729
Change-Id: I2beda7496b95a2b7c1aafc8cfcfcdde662c31898
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-05-14 13:59:05 -07:00
Haritha Chintalapati
6dc28f8c2d Merge "msm: camera: isp: Prevent false timeout in dual IFE reset" into camera-kernel.lnx.5.0 2021-05-13 12:05:45 -07:00
Haritha Chintalapati
b14f3420a7 Merge "msm: camera: isp: Set RDI only context flag for CSID resource node" into camera-kernel.lnx.5.0 2021-05-13 12:05:31 -07:00
Haritha Chintalapati
8fc496e430 Merge "msm: camera: isp: Move clock voting to common vfe top" into camera-kernel.lnx.5.0 2021-05-13 12:05:16 -07:00
Haritha Chintalapati
64d562975b Merge "msm: camera: isp: Do not handle recoverable errors as fatal" into camera-kernel.lnx.5.0 2021-05-13 12:04:45 -07:00
Haritha Chintalapati
0542af5b27 Merge "msm: camera: utils: Enable using mmrm API in camera" into camera-kernel.lnx.5.0 2021-05-13 12:04:28 -07:00
Haritha Chintalapati
2e994b2c81 Merge "msm: camera: utils: Add using mmrm in camera" into camera-kernel.lnx.5.0 2021-05-13 12:03:54 -07:00
Haritha Chintalapati
c166730fd2 Merge "msm: camera: cpas: Add qchannel register info for v680 hw" into camera-kernel.lnx.5.0 2021-05-13 12:03:33 -07:00
Haritha Chintalapati
6f47c080ff Merge "msm: camera: cpas: Move camnoc register offsets to header" into camera-kernel.lnx.5.0 2021-05-13 12:03:14 -07:00