Commit graph

966 commits

Author SHA1 Message Date
Haritha Chintalapati
cdb34b148c Merge "msm: camera: isp: Handle QCFA bin eanbled case for MP limit fuse" into camera-kernel.lnx.4.0 2020-11-06 17:23:44 -08:00
Haritha Chintalapati
c03621dca8 Merge "msm: camera: isp: Change dual IFE acquire sequence" into camera-kernel.lnx.4.0 2020-11-06 17:23:28 -08:00
Haritha Chintalapati
a993be775c Merge "msm: camera: isp: Move the CSID irq logs to bottom half" into camera-kernel.lnx.4.0 2020-11-05 14:04:26 -08:00
Haritha Chintalapati
19da7f0650 Merge "msm: camera: isp: Fix the callback arguments in IFE" into camera-kernel.lnx.4.0 2020-11-05 14:03:55 -08:00
Haritha Chintalapati
e3cca4c36a Merge "msm: camera: isp: Validate the ife bw blob data" into camera-kernel.lnx.4.0 2020-11-05 14:03:38 -08:00
Haritha Chintalapati
f040c20e68 Merge "msm: camera: ife: Fix bus print dimension" into camera-kernel.lnx.4.0 2020-11-05 14:03:18 -08:00
Haritha Chintalapati
857cbdaa51 Merge "msm: camera: tfe: Enable the tfe diag debug feature" into camera-kernel.lnx.4.0 2020-11-05 14:02:26 -08:00
Haritha Chintalapati
792be0d9c4 Merge "msm: camera: reqmgr: Fix timing issue while destroying the session" into camera-kernel.lnx.4.0 2020-11-05 14:02:08 -08:00
Wyes Karny
ab996a3ace msm: camera: isp: Handle QCFA bin eanbled case for MP limit fuse
When QCFA binning is enabled adjust MP limit fuse checking
to check actual proessing width for IFE.

CRs-Fixed: 2808086
Change-Id: I22af38ba36ad84372699a177c203c1acbae76cb9
Signed-off-by: Wyes Karny <wkarny@codeaurora.org>
2020-11-05 13:22:29 +05:30
Chandan Kumar Jha
68f9e9185d msm: camera: isp: Move the CSID irq logs to bottom half
Remove the sof log in CSID irq handler and handle it in the
Bottom half.Sof irq enabled during the sof freeze scenario
and sof log getting printed in the irq handler causing the
interrupt handling taking more time.

CRs-Fixed: 2804588
Change-Id: I9514bf79333665dcd9407932789ce00c4ed480d8
Signed-off-by: Chandan Kumar Jha <cjha@codeaurora.org>
2020-11-04 03:27:56 -08:00
Anand Ravi
55eb3c37f4 msm: camera: ife: Fix bus print dimension
Fixes the null pointer dereference in the print dimension function.

CRs-Fixed: 2809214
Change-Id: I6467f183cca9f665c89f1a418b320cd55be7700a
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2020-11-03 15:30:59 -08:00
Ravikishore Pampana
162bc103f2 msm: camera: tfe: Enable the tfe diag debug feature
Tfe sensor diag feature is not enabled properly. Enable
the diag feature based on the debug fs value. Log the
tfe measured sensor diag status for camif and rdi paths.

Enable the tfe diag status with below command
adb shell "echo 0x1 > /sys/kernel/debug/camera_ife/tfe_camif_debug".

CRs-Fixed: 2810952
Change-Id: I47cd57e38a38010fb7fba048c35e907e1980b797
Signed-off-by: Ravikishore Pampana <rpampana@codeaurora.org>
2020-11-02 23:14:44 -08:00
Karthik Anantha Ram
0ce4dfa52b msm: camera: isp: Change dual IFE acquire sequence
In case of dual, acquire IFEs from a higher to lower idx.
The IFE with the higher hw_idx will be configured as slave.

CRs-Fixed: 2805265
Change-Id: I35e3af84e2ac6586056e6d74373642a85e5c797a
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-11-02 18:56:40 -08:00
Haritha Chintalapati
ce4e3d7296 Merge "msm: camera: smmu: Avoid NULL dereference in cam_smmu_alloc_firmware" into camera-kernel.lnx.4.0 2020-11-02 15:29:50 -08:00
Haritha Chintalapati
f7541e1999 Merge "msm: camera: reqmgr: Move skip frame log to rate limit for WQ congestion" into camera-kernel.lnx.4.0 2020-11-02 15:29:32 -08:00
Haritha Chintalapati
4afd2d107d Merge "msm: camera: cci: Add back mutex on cci" into camera-kernel.lnx.4.0 2020-11-02 15:28:50 -08:00
Ayush Kumar
ed6a1ed193 msm: camera: isp: Validate the ife bw blob data
If ife bandwidth number of paths configuration is zero then do not
proceed. Number of bandwidth paths should be minimum one and
should not be greater than max value.

CRs-Fixed: 2801769
Change-Id: I2bf5cd4ea76ca7ecd9ca968bced2957a76691001
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2020-11-02 17:39:31 +05:30
zhuo
ee8e8ee884 msm: camera: reqmgr: Fix timing issue while destroying the session
During destroying the session, sof freeze timeout happens
after destroying workqueue. Then sof freeze timeout callback
will access workqueue causing use after free memory issue.
This change invokes destroying timer prior to workqueue.

CRs-Fixed: 2807936
Change-Id: I1f0dcb7a03fbf802f4ec872727e3b627a78f56f8
Signed-off-by: zhuo <zhuo@codeaurora.org>
2020-10-30 15:39:24 +08:00
Jigar Agrawal
d3650f098c msm: camera: isp: Fix the callback arguments in IFE
Fix the callback arguments in IFE to avoid the CFI
check failure. A few callbacks invokes do not typecast for
the last argument of the event callback. Since callbacks
are indirect function call, CFI check for this will fail.

CRs-Fixed: 2807933
Change-Id: I4e72cf07de701bbfd8f7d7829207256918beeb4c
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2020-10-29 17:31:11 -07:00
Camera Software Integration
1d4846d08d Merge "msm: camera: jpeg: Add traces to profile jpeg processing time" into camera-kernel.lnx.4.0 2020-10-29 15:37:29 -07:00
Camera Software Integration
4ba4661231 Merge "msm: camera: cpas: Removing getting clk rate in cpas dump" into camera-kernel.lnx.4.0 2020-10-29 15:37:13 -07:00
Camera Software Integration
370725a4b0 Merge "msm: camera: ife: Add support for camera v680 bus" into camera-kernel.lnx.4.0 2020-10-29 15:36:57 -07:00
Camera Software Integration
7db6609786 Merge "msm: camera: vfe: Add support for new VFE hardware" into camera-kernel.lnx.4.0 2020-10-29 15:36:41 -07:00
Camera Software Integration
e57a660343 Merge "msm: camera: isp: Add UAPI changes for new VFE hardware" into camera-kernel.lnx.4.0 2020-10-29 15:36:26 -07:00
Camera Software Integration
5a2fb767ac Merge "msm: camera: icp: Support NRT ipe clock bump-up" into camera-kernel.lnx.4.0 2020-10-29 15:36:07 -07:00
Camera Software Integration
3d7b6af67c Merge "msm: camera: cpas: Update jpeg qosgen settings" into camera-kernel.lnx.4.0 2020-10-29 15:35:57 -07:00
Wyes Karny
22004e3a95 msm: camera: reqmgr: Move skip frame log to rate limit for WQ congestion
In the case of workqueue congestion move the skip frame logs to
rate info limit.

CRs-Fixed: 2800932
Change-Id: I96988ff73ae182d55eb3f3d15de9b02f13c34b39
Signed-off-by: Wyes Karny <wkarny@codeaurora.org>
2020-10-29 15:38:13 +05:30
Fernando Pacheco
4e09bf5f97 msm: camera: smmu: Avoid NULL dereference in cam_smmu_alloc_firmware
The iommu domain we grab from iommu_get_domain_for_dev can
be NULL. Eventually we will hit a NULL dereference in the
cam_smmu_alloc_firmware due to the missing check. Modify the
existing check to account for the possiblity of a NULL
domain and bail early.

CRs-Fixed: 2804766
Change-Id: I201260c3559b847cfb0bf7f85226816af148671d
Signed-off-by: Fernando Pacheco <fpacheco@codeaurora.org>
2020-10-28 15:46:13 -07:00
Camera Software Integration
bd56b374d0 Merge "msm: camera: sensor: Rename the dtsi entry to avoid the predefined string" into camera-kernel.lnx.4.0 2020-10-28 13:28:52 -07:00
Camera Software Integration
a7a72f3fae Merge "msm: camera: icp: Tidy up hfi queue dump" into camera-kernel.lnx.4.0 2020-10-28 13:28:44 -07:00
Camera Software Integration
d65b98953a Merge "msm: camera: tfe: Correct Configuration of top tpg mux selection" into camera-kernel.lnx.4.0 2020-10-28 13:28:10 -07:00
Camera Software Integration
dc33d7705c Merge "msm: camera: reqmgr: Add protection while destroying the link" into camera-kernel.lnx.4.0 2020-10-28 13:28:03 -07:00
Camera Software Integration
3da4013942 Merge "msm: camera: smmu: Fix the smmu create_handle function" into camera-kernel.lnx.4.0 2020-10-28 13:27:55 -07:00
Camera Software Integration
02d480f026 Merge "msm: camera: utils: Add option to not set src clk rate" into camera-kernel.lnx.4.0 2020-10-28 13:27:46 -07:00
Pavan Kumar Chilamkurthi
297cc95f5f msm: camera: jpeg: Add traces to profile jpeg processing time
Add traces before starting jpeg encode and once done irq is
generated from hw.

CRs-Fixed: 2789495
Change-Id: I02da722ed9ba0b7f4450536e35d298b8757c0655
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2020-10-28 10:33:12 -07:00
Pavan Kumar Chilamkurthi
fdff0bcadc msm: camera: cpas: Removing getting clk rate in cpas dump
cpas dump may be called from tasklets where sleep is
not allowed. Remove calling clk get rate APIs which
will internally have mutexes which can sleep.

CRs-Fixed: 2797701
Change-Id: Ia46238c26e4f39978f58643716a43fbdb60e8ae6
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2020-10-28 10:32:40 -07:00
Pavan Kumar Chilamkurthi
d71c9ccbe5 msm: camera: cpas: Update jpeg qosgen settings
Use OT limit as 16 for jpeg niu path. This help in
controlling jpeg bw flow and to avoid any backpressure
on IFE paths.

CRs-Fixed: 2789495
Change-Id: I458fa076f59915a7c11be9e7c3d78b412c5c7c5a
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2020-10-28 10:30:01 -07:00
Mukund Madhusudan Atre
1332b49e26 msm: camera: ife: Add support for camera v680 bus
This change adds support for Waipio bus hardware. It also
changes the bus private structure to be pointer based so
that most of the information is filled from hardware
specific headers.

CRs-Fixed: 2794540
Change-Id: Ie9d30442246a896f372512b62bd54be32c4921ad
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-10-27 20:56:23 -07:00
Mukund Madhusudan Atre
c57b4483bc msm: camera: vfe: Add support for new VFE hardware
This change adds hardware information for VFE
version 680 hardware.

CRs-Fixed: 2794540
Change-Id: I0c2f3cceca5d40cece1312a21f984a9f14f80a9a
Signed-off-by: Vishalsingh Hajeri <vhajeri@codeaurora.org>
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-10-27 20:55:27 -07:00
Mukund Madhusudan Atre
f3965d4eec msm: camera: isp: Add UAPI changes for new VFE hardware
Add UAPI definitions for output resources of new VFE hardware.
Add changes to get the max output resource value based on
hardware version, at the time of probe.

CRs-Fixed: 2794540
Change-Id: I5f11be0546012c5f806153c2fd6b0aeb993f5d93
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-10-27 20:41:56 -07:00
chengxue
6b90e92888 msm: camera: cci: Add back mutex on cci
there should be a race condition on rd_done
read/write between cam_cci_irq and
cam_cci_read_bytes, add mutex to avoid.

CRs-Fixed: 2786609
Change-Id: Ic55976133bfdc7958b4b3c8b0efdf896f82e7ccf
Signed-off-by: chengxue <chengxue@codeaurora.org>
2020-10-28 10:38:49 +08:00
Camera Software Integration
924e53bea5 Merge "msm: camera: icp: remove the ioconfig dump during the error" into camera-kernel.lnx.4.0 2020-10-27 14:48:28 -07:00
Camera Software Integration
435f022bda Merge "msm: camera: csid: Fix the EOT IRQ Reception for Sensors with EPD" into camera-kernel.lnx.4.0 2020-10-27 14:48:15 -07:00
Camera Software Integration
73f713fd0b Merge "msm: camera: common: Enable flash operation at EOF" into camera-kernel.lnx.4.0 2020-10-27 14:48:07 -07:00
Alok Chauhan
60ad5470c2 msm: camera: icp: Support NRT ipe clock bump-up
Whenever there are NRT request then bump-up ipe clock
to max. Clock will get reduced as part of context timer expires.

CRs-Fixed: 2793751
Change-Id: I28a0b32bd52b58e293439042008711ea454a64f3
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
2020-10-27 22:14:25 +05:30
Pavan Kumar Chilamkurthi
d1177505ae msm: camera: utils: Add option to not set src clk rate
Clients like cpas scale some clocks like slow_ahb, fast_ahb
through vote level based on other hw's src clk freq while
the actual src clock (camnoc) is calculated and set directly
through set_src_clk API. This will overwrite freq of camnoc_axi
with the same level as AHB when ahb clocks are set. Do not
set src clk rate while setting rate for other clocks using level.

CRs-Fixed: 2793673
Change-Id: I5538a5cebf4e47c407a2bf9778136500b1162b4a
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2020-10-27 02:51:15 -07:00
Vikram Sharma
0bc1d52785 msm: camera: reqmgr: Add protection while destroying the link
This change handles a race while destroying session. Protecting the
session destroy with session lock.

CRs-Fixed: 2799907
Change-Id: Ia1f90a56f6bfed00439b8012e41bfae9e8f739a3
Signed-off-by: Vikram Sharma <vikramsa@codeaurora.org>
2020-10-27 12:27:11 +05:30
Fernando Pacheco
593ababe3a msm: camera: icp: Tidy up hfi queue dump
Two changes packed as one: refactor queue dump code and reformat
dump output. The first should be self-explanatory.

For the second, displaying one double word per line places an
unnecessary burden on the reader. We can balance the vertical
and horizontal space utilized for the dump by printing
four double words at a time.

Example:
word[0000]: 0x00000008 0x00010001 0x00000008 0x00010002
word[0004]: 0x00000014 0x00010003 0x00000001 0x00000008
word[0008]: 0x00000001 0x00000020 0x00010003 0x00000001
word[0012]: 0x00000009 0x00007083 0x0001620f 0x00007083
word[0016]: 0x0001620f 0x00000018 0x00010003 0x00000001
word[0020]: 0x00000005 0x00000001 0x00010000 0x00000010
word[0024]: 0x00010005 0x84f07c60 0xffffffd8 0x0000001c
word[0028]: 0x01010008 0x00000002 0x84f07c60 0xffffffd8
...

CRs-Fixed: 2805272
Change-Id: Ibc0ef955b5120ca2265cd1262fd91c124843dac0
Signed-off-by: Fernando Pacheco <fpacheco@codeaurora.org>
2020-10-26 11:33:19 -07:00
Jigarkumar Zala
96a10ecb42 msm: camera: common: Enable flash operation at EOF
Flash operation is currently being done at EPOCH timeframe. In order
to support flash operation at EPOCH extra frame needs to skip to avoid
partial lit on previous request. Moving flash operation to EOF saves
one frame and also give more stability to perform the operation with
higher stablility with removing partial lit. This change gives flash
hardware extra time to perform the operation for turn on/off the flash
hardware.

CRs-Fixed: 2795719
Change-Id: I08b82527006d8a9c81c5a5be0768705051cbd3f1
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2020-10-23 14:56:38 -07:00
Jigarkumar Zala
d2639c2650 msm: camera: sensor: Rename the dtsi entry to avoid the predefined string
shared-pinctrl-gpios and shared-gpios needs to rename with gpios-shared
and gpios-shared-pinctrl to avoid the predefined format of base kernel
dtsi parsing string. Due to this there is a probe sequence delay happening
and as it is hitting the boottime KPI badly.

CRs-Fixed: 2804449
Change-Id: I26a0149ba1abb89b52750fb069e064642ca446f5
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2020-10-23 12:58:45 -07:00