Commit graph

1,120 commits

Author SHA1 Message Date
Depeng Shao
ee418bbd88 msm: camera: reqmgr: Reset the trigger cnt when trigger cnt mismatch
In sHDR case, the trigger cnt may be different when one of the IFE
meet bubble or irq delay issue, then reset the trigger cnt when
we find the trigger cnt is different.

CRs-Fixed: 2857614
Change-Id: Ie02fd7204bebd16d32d7a277ac1f2e45f8357dd9
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2021-03-03 09:55:40 +08:00
Camera Software Integration
1cfb76902b Merge "msm: camera: isp: Update UAPI to remove tpg pattern ID" into camera-kernel.lnx.4.0 2021-03-02 10:51:13 -08:00
Camera Software Integration
a571335dea Merge "msm: camera: isp: Change warn logs to rate limited" into camera-kernel.lnx.4.0 2021-03-02 10:05:19 -08:00
Karthik Anantha Ram
dc8a8bf623 msm: camera: isp: Update UAPI to remove tpg pattern ID
Update UAPI on lahaina kernel to remove tpg pattern ID.

CRs-Fixed: 2886651
Change-Id: I2d2f451ce80f965a656952791e55467f4ffd2f6e
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-02-25 09:51:40 -08:00
Ayush Kumar
a379fd5e5d msm: camera: isp: Change warn logs to rate limited
In apply failure due to congestion and if not recovered, warn logs
causing excessive logging issues. Change the warn logs to rate
limit in apply failure due to congestion.

CRs-Fixed: 2884313
Change-Id: Id46a0cbe6a248a9186a6267577374f4fbadcf64f
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2021-02-24 20:21:24 +05:30
Tejas Prajapati
87fff904c1 msm: camera: cdm: check reset status for error
If there are any reset errors for the CDM, CDM should
send error to UMD upon reset failure. Updated the
error status with relevant error code.

CRs-Fixed: 2882732
Change-Id: I12e746f71b1a294aa4e7ef540f39aec91fb44648
Signed-off-by: Tejas Prajapati <tpraja@codeaurora.org>
2021-02-19 10:27:16 +05:30
Camera Software Integration
6ef679859d Merge "msm: camera: flash: Apply flash packets at epoch instead of eof" into camera-kernel.lnx.4.0 2021-02-18 09:18:42 -08:00
Camera Software Integration
344dad9915 Merge "msm: camera: isp: IFE and CSID probe based on fuse" into camera-kernel.lnx.4.0 2021-02-18 09:18:31 -08:00
Tony Lijo Jose
6bda2323cb msm: camera: flash: Apply flash packets at epoch instead of eof
Partial lighted frame can be observed if flash packet is getting applied
at  eof instead of epoch. This change make the flash packet to be
applied at epoch instead of eof.

CRs-Fixed: 2853936
Change-Id: I77dac7c0b8cb8149f26c5f89cced590bc3b957ee
Signed-off-by: Tony Lijo Jose <tjose@codeaurora.org>
2021-02-16 23:20:03 +05:30
Alok Chauhan
d0e2538e98 msm: camera: cdm: Update hang detect logic
Currently cdm driver is updating work records
in case of all the interrupts received, but
decrementing only when it schedule workq for
inline irq interrupt. This causes the mismatch
in work records and return incorrect work record
count when cdm client check the cdm hang detect.

Updated hang detect logic in cdm driver.

CRs-Fixed: 2878695
Change-Id: I7039422bf573a7105c16ac2f752eb235c377bfee
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
2021-02-16 12:40:28 +05:30
Alok Chauhan
2ee0a3ec89 msm: camera: ope: Update for new IQ modules
Added changes to dump new IQ modules as well
in OPE during page fault and hang scenario.

CRs-Fixed: 2878214
Change-Id: I97e7d4ee2ed9899ed299155c9aca8b094dff18f0
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
2021-02-15 22:55:47 -08:00
Alok Chauhan
363894c03b msm: camera: ope: Dump stripe info at the time of hang
Add logic to dump stripe info and wait event status at the
time of cdm hang.

CRs-Fixed: 2878214
Change-Id: Ib9892b0273e4436988c5f1384d18d60d29529c94
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
2021-02-16 12:23:09 +05:30
Wyes Karny
26182c7d58 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-02-13 16:29:32 +05:30
Camera Software Integration
51f76262d2 Merge "msm: camera: csiphy: Add debugfs support for csiphy" into camera-kernel.lnx.4.0 2021-02-04 10:50:54 -08:00
Camera Software Integration
2f9eab3e04 Merge "msm: camera: isp: Correct halt command for Yupik camera" into camera-kernel.lnx.4.0 2021-02-01 21:37:55 -08:00
Jigar Agrawal
e4e543bb04 msm: camera: csiphy: Add debugfs support for csiphy
Add debugfs support for csiphy and create a new debugfs
for enable/disable csiphy irqs. Following command can be
used to enable the csiphy0 irqs:
adb shell "echo 0x1 >>
/sys/kernel/debug/camera_csiphy/csiphy0_en_irq_dump".

CRs-Fixed: 2829969
Change-Id: I769c84f0cd0bf048652cf2d186d900e470973b0a
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-02-01 13:18:22 -08:00
Sridhar Gujje
bf2c5a30cd Revert "msm: camera: isp: IFE and CSID probe based on fuse"
This reverts commit afb3736650.

Change-Id: I6f77e1c24a14eacff6a7a3b7e74726557343fd45
Signed-off-by: Sridhar Gujje <sgujje@codeaurora.org>
2021-02-01 12:48:04 +05:30
Camera Software Integration
96bf548345 Merge "msm: camera: isp: IFE and CSID probe based on fuse" into camera-kernel.lnx.4.0 2021-01-29 06:32:04 -08:00
Ayush Kumar
39c0ecd734 msm: camera: isp: Correct halt command for Yupik camera
This change is to correct csid halt command and correct qos setting
for Yupik camera.

CRs-Fixed: 2825675
Change-Id: I002a3f5864f6c157249465bdf71d268b547eb196
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2021-01-29 15:08:30 +05:30
Camera Software Integration
bb9384903a Merge "msm: camera: isp: Correct assignment of clock rates" into camera-kernel.lnx.4.0 2021-01-27 04:11:21 -08:00
Camera Software Integration
58bd7464d1 Merge "msm: camera: csiphy: Update the csiphy programming sequence" into camera-kernel.lnx.4.0 2021-01-27 04:10:45 -08:00
Camera Software Integration
f1416aafcf Merge "msm: camera: csiphy: Trigger ISP callback on phy clock change" into camera-kernel.lnx.4.0 2021-01-27 04:10:30 -08:00
Camera Software Integration
2b445c5810 Merge "msm: camera: ope: Handle OPE smmu fault with pid info" into camera-kernel.lnx.4.0 2021-01-26 07:37:40 -08:00
Camera Software Integration
f56937ec60 Merge "msm: camera: common: Improve the CSID logging" into camera-kernel.lnx.4.0 2021-01-26 07:37:27 -08:00
Camera Software Integration
ebd6997ee8 Merge "msm: camera: cci: Add report id in report command for CCI I2C queue" into camera-kernel.lnx.4.0 2021-01-26 07:37:05 -08:00
Jigar Agrawal
f36a214704 msm: camera: csiphy: Update the csiphy programming sequence
Update the 3 phase bring up sequence for csiphy1.2.3 header
to align with version_8 updated on 01/08/2021.

CRs-Fixed: 2856350
Change-Id: I06b164fbb0a589f22f973476709008d0c7ac32ca
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-01-20 14:56:32 -08:00
Shravya Samala
e1ea9edec2 msm: camera: isp: Correct assignment of clock rates
If there is no change in CSID and TFE clock rates
then correctly assign current clock rates to local
varaibles.

CRs-Fixed: 2855742
Change-Id: Ibd71274ba7a7844c3841060eb3b3b14ba80ed4b0
Signed-off-by: Shravya Samala <shravyas@codeaurora.org>
2021-01-20 16:55:50 +05:30
Vikram Sharma
2e1910ed07 msm: camera: ope: Handle OPE smmu fault with pid info
Kernel apis provide information fault caused pid and mid data.
Handle the OPE 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 ope node dt entries.

CRs-Fixed: 2857868
Change-Id: I909f1787e71e67e5ed1d3464dfeb506418d151e4
Signed-off-by: Vikram Sharma <vikramsa@codeaurora.org>
2021-01-19 20:32:48 -08:00
Jigar Agrawal
1996f82b71 msm: camera: common: Improve the CSID logging
Improve CSID irq logging for better debugging.
Add support to dump the hw source clock.

CRs-Fixed: 2808577
Change-Id: I06608588ef7a6e0ebc174a1ba138f6e16a9094f2
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-01-19 12:30:25 -08:00
shiwgupt
d280856962 msm: camera: cci: Add report id in report command for CCI I2C queue
-Report id is a unique 4-bit value associated with the report command.
 Interrupt is generated on each report command execution. This change
 helps to know whether interrupt is received for a corresponding report
 id. Report id can be checked in REPORT_STATUS register. This change
 adds report id in report command of CCI I2C queue as per HPG.

CRs-Fixed: 2857533
Change-Id: I0c3066962e21c7c024e67ae81ecb762ba331e329
Signed-off-by: shiwgupt <shiwgupt@codeaurora.org>
2021-01-19 11:11:10 +05:30
shiwgupt
851a04fce1 msm: camera: csiphy: Trigger ISP callback on phy clock change
Trigger callback to ISP each time when there is a change
in phy clock so that csid and tfe clock rates can be
updated accordingly. Argument passed in callback api is
the final phy clock rate that is applied.

CRs-Fixed: 2854066
Change-Id: Ia74465e4082e08b4c50338e0eb779f996afa2795
Signed-off-by: shiwgupt <shiwgupt@codeaurora.org>
2021-01-19 10:42:32 +05:30
Vikram Sharma
c3f06e4d02 msm: camera: isp: Add new packer format to support LSB alignment
Add new packer format to support LSB alignment for plain16_10
packer format.

CRs-Fixed: 2825675
Change-Id: I401241dc14dc67d3b363d3d39b37aabe716e167c
Signed-off-by: Vikram Sharma <vikramsa@codeaurora.org>
2021-01-15 10:29:13 +05:30
Camera Software Integration
168408b487 Merge "msm: camera: isp: Maintain clock rate relation between CSIHPY, CSID and TFE" into camera-kernel.lnx.4.0 2021-01-13 03:16:37 -08:00
Camera Software Integration
8aca4051fc Merge "msm: camera: cdm: corrected submit bl logic" into camera-kernel.lnx.4.0 2021-01-11 23:38:15 -08:00
Camera Software Integration
03e07e03dc Merge "msm: camera: cpas: Add mechanism to check camnoc idle status" into camera-kernel.lnx.4.0 2021-01-11 23:37:45 -08:00
Camera Software Integration
74553e55b8 Merge "msm: camera: cpas: Add version map entry for 680 titan version" into camera-kernel.lnx.4.0 2021-01-11 23:37:26 -08:00
Sridhar Gujje
1fbbac1512 Revert "msm: camera: jpeg: Add more data in case of smmu pf"
This reverts commit 0204c76b58.

Change-Id: I43ff50e01db0ac0cc2b9b56753198ef1653d942a
Signed-off-by: Sridhar Gujje <sgujje@codeaurora.org>
2021-01-12 11:16:35 +05:30
Shravya Samala
c15edd4c3d msm: camera: isp: Maintain clock rate relation between CSIHPY, CSID and TFE
Added checks to confirm CSID frequency greater than
CSIPHY frequency, TFE frequency greater than CSID
frequency. Also TFE frequency should be such that
it can accommodate PHY data rate.

CRs-Fixed: 2847155
Change-Id: I5d3dcc53a6f27129f4b82cba1254445f58f6d0cf
Signed-off-by: Shravya Samala <shravyas@codeaurora.org>
2021-01-07 04:21:26 -08:00
Ayush Kumar
afb3736650 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.

CRs-Fixed: 2825675
Change-Id: I37f059c6591f3a6e57277029859e1b8b0e48905d
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2021-01-05 23:33:04 -08:00
Linux Build Service Account
38b96be690 Merge "msm: camera: isp: Add YUV support in CAMIF" into camera-kernel.lnx.4.0 2021-01-05 08:36:30 -08:00
Ayush Kumar
cce99f8e4f msm: camera: cpas: Add version map entry for 680 titan version
This change add cpas hw version map entry for 680 titan
version. And remove cpas version check for ubwc support.

CRs-Fixed: 2825675
Change-Id: I858838a5a774c964a1a09d96114442f69058670a
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2021-01-05 17:22:06 +05:30
Alok Chauhan
3f527598f0 msm: camera: cpas: Add mechanism to check camnoc idle status
Qchannel interface is used to ensure camnoc is idle. This needs
to be check before camera core power collapse and after camera core
power on sequence to make sure camera hw blocks are in proper state.

CRs-Fixed: 2847646
Change-Id: If9dbd980c2e8e983ac973f91e3d1ed132719c395
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
2021-01-04 17:03:19 +05:30
Alok Chauhan
66d043d43a msm: camera: cdm: corrected submit bl logic
CDM driver check for available bl fifo slots before
submitting to HW. If no free slots available then
it wait for CDM HW to process all the BLs and return
available slots.

CDM driver was incorrectly calculating the available bl
slots and causing bl fifo overflow.

Corrected the sequence in wait for bl fifo logic.

CRs-Fixed: 2837583
Change-Id: I2861f8c66822e0739f0546eaf153d8e2af0caefe
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
2021-01-04 12:28:08 +05:30
Camera Software Integration
d12abfb4fd Merge "msm: camera: csiphy: Add logic to program common register" into camera-kernel.lnx.4.0 2021-01-03 13:39:01 -08:00
Camera Software Integration
4e272cc9e3 Merge "msm: camera: jpeg: Add more data in case of smmu pf" into camera-kernel.lnx.4.0 2021-01-03 13:38:24 -08:00
Camera Software Integration
c4a7cddc88 Merge "msm: camera: isp: increase number of hw entries" into camera-kernel.lnx.4.0 2021-01-03 13:38:12 -08:00
Gaurav Jindal
472804a0fc msm: camera: isp: Add YUV support in CAMIF
Add support to configure the incoming format in the top
core Camif register. Changes in CSID file to support YUV
TPG are also integrated.

CRs-Fixed: 2846873
Change-Id: I87fa0171a60013ba356a33455170cf1ecfbb0563
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2020-12-31 09:49:53 +05:30
Camera Software Integration
b37352f969 Merge "msm: camera: reqmgr: check validity of last_applied_idx" into camera-kernel.lnx.4.0 2020-12-29 03:13:58 -08:00
Vikram Sharma
0204c76b58 msm: camera: jpeg: Add more data in case of smmu pf
When we have smmu page fault of unmapped address and
active flag is false we can cache and store unmapped
address and print in case of error.
Added check for last flushed req during config hw for
jpeg as well.

CRs-Fixed: 2834236
Change-Id: I9b9bb735587799871f9bdef94985f6269ca6a29d
Signed-off-by: Vikram Sharma <vikramsa@codeaurora.org>
2020-12-28 22:52:39 -08:00
Camera Software Integration
2f911b9c72 Merge "msm: camera: cdm: Improve cdm logging" into camera-kernel.lnx.4.0 2020-12-26 08:42:52 -08:00