Wykres commitów

989 Commity

Autor SHA1 Wiadomość Data
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
Karthik Anantha Ram
fde5d66e83 msm: camera: isp: Skip qtimer shutter for invalid req_id
In order to reduce the traffic on the v4l2 queue, avoid
posting qtimer shutter for bubbled frames.

CRs-Fixed: 2799794
Change-Id: Id752605e7aff89246edfeec9337612bb7c9b4790
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-10-23 17:13:35 -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
Ravikishore Pampana
353c16eb68 msm: camera: icp: remove the ioconfig dump during the error
If io config send failure happens, currently dumping the
io configuration for debug purpose. If more io configuration
data is there, it will cause excessive logs. So removed
io configuration dump in icp driver. On acquire failure,
acquire node can dump the same.

CRs-Fixed: 2800304
Change-Id: I4c6a7973eb789de8c3384311bce033070e07692f
Signed-off-by: Ravikishore Pampana <rpampana@codeaurora.org>
2020-10-23 17:57:02 +05:30
Shravya Samala
60d4dbf3de msm: camera: tfe: Correct Configuration of top tpg mux selection
In case of concurrent tpg use case, configure top tpg mux sel
properly.

CRs-Fixed: 2804168
Change-Id: I9955c9f03cebac854a339ff5161a99ecaf27cbdf
Signed-off-by: Shravya Samala <shravyas@codeaurora.org>
2020-10-23 04:37:18 -07:00
Jigar Agrawal
bf2282bad6 msm: camera: smmu: Fix the smmu create_handle function
Fix the smmu create_handle function to not generate
null handles.

CRs-Fixed: 2801574
Change-Id: Ia6de2b80915a8fd937d3745eb4c1f25ba16d21aa
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2020-10-22 17:11:04 -07:00
Jigar Agrawal
975ced97e2 msm: camera: csid: Fix the EOT IRQ Reception for Sensors with EPD
Sensors with EPD feature do not subscribe to the ERROR_EOT IRQ.
However, the CSID IRQ mask do not prevent from setting the IRQ
status, it only prevents the IRQ from getting fired. Add check
in csid irq to prevent detecting the EOT for Sensors with EPD.

CRs-Fixed: 2798458
Change-Id: I8e029834918326b70154a989fbdff747de7851ed
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2020-10-22 17:07:35 -07:00
Camera Software Integration
91a37fd070 Merge "msm: camera: tfe: Move the CSID irq logs to bottom half" into camera-kernel.lnx.4.0 2020-10-22 13:34:35 -07:00
Camera Software Integration
b1f3e6bc29 Merge "msm: camera: sync: Increase V4l2 queue size to 250" into camera-kernel.lnx.4.0 2020-10-22 13:34:19 -07:00
Camera Software Integration
163e4e5cdc Merge "msm: camera: tfe: TPG stop Call" into camera-kernel.lnx.4.0 2020-10-22 13:34:12 -07:00
Camera Software Integration
409db05c5a Merge "msm: camera: ife: Detect RDI only context before acquire hw" into camera-kernel.lnx.4.0 2020-10-21 13:27:13 -07:00
Ravikishore Pampana
bb2e9aaeb9 msm: camera: tfe: 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: 2796120
Change-Id: I29341efcf0134f69b9dc8284785044ee08be13b6
Signed-off-by: Ravikishore Pampana <rpampana@codeaurora.org>
2020-10-21 16:57:26 +05:30
Shravya Samala
5155e8b612 msm: camera: tfe: TPG stop Call
Move TPG stop call before checking if
Deinit call is required or not.

CRs-Fixed: 2777023
Change-Id: I9c7be620c2ba2762324129e547efc1d2a8dd6f40
Signed-off-by: Shravya Samala <shravyas@codeaurora.org>
2020-10-21 00:09:36 -07:00
Shravya Samala
41cdb719fd msm: camera: sync: Increase V4l2 queue size to 250
For MFHDR plus EIS case, both long and short exposure
input ports will be connected. Thus overall connected
ports for EIS will be 8, resulting in V4L2 queue
depth to 240.

CRs-Fixed: 2794286
Change-Id: I12a1ae4129ccb7e3b7211a22891016ecd769b949
Signed-off-by: Shravya Samala <shravyas@codeaurora.org>
2020-10-20 22:37:50 -07:00
Camera Software Integration
a3af5ac2a3 Merge "msm: camera: sensor: Power down in case of cci init failure" into camera-kernel.lnx.4.0 2020-10-20 13:24:55 -07:00
Camera Software Integration
517d32cb7b Merge "msm: camera: tfe: Enable only master interrupts in dual tfe usecase" into camera-kernel.lnx.4.0 2020-10-19 13:21:17 -07:00
Jigarkumar Zala
33899faa8b msm: camera: sensor: Power down in case of cci init failure
Currently power down is not happening in case of cci_init failure.
This can lead to corruption for the next power up, as power down
did not happen for the previous session. This change does power down
in case of cci failure and as a part of that it can power up resources
correctly in next session.

CRs-Fixed: 2797857
Change-Id: I9089222cb45834ae895903a4a3e21dd799beb3ed
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2020-10-16 14:12:01 -07:00
Camera Software Integration
b2f5752ef5 Merge "msm: camera: isp: removed mutext lock from irq context" into camera-kernel.lnx.4.0 2020-10-16 13:17:25 -07:00
Camera Software Integration
4e289c6238 Merge "msm: camera: isp: Change csid stop sequence during flush" into camera-kernel.lnx.4.0 2020-10-16 13:17:17 -07:00
Camera Software Integration
e86cb226b6 Merge "msm: camera: tfe: Dont consider vbi for epoch configuration in case of tpg" into camera-kernel.lnx.4.0 2020-10-15 14:18:24 -07:00
Camera Software Integration
9b1afc8918 Merge "msm: camera: common: Merge camera-kernel.3.1 changes in camera-kernel.4.0" into camera-kernel.lnx.4.0 2020-10-15 14:18:14 -07:00
Ravikishore Pampana
1fa7773fb1 msm: camera: tfe: Enable only master interrupts in dual tfe usecase
Enable only master sof, eof, epoch interrupts in dual tfe case.
Due to scheduling issues one tfe core interrupts will be delayed
that cause mis match of dual core interrupts events and eventually
cause the frame drops.

CRs-Fixed: 2796046
Change-Id: Ic16de3242e902bebaf79f83b9a332f0b7006908e
Signed-off-by: Ravikishore Pampana <rpampana@codeaurora.org>
2020-10-15 18:11:53 +05:30
Shravya Samala
a3077c7802 msm: camera: isp: Change csid stop sequence during flush
This change takes care of a race which we see when we halt master
csid immediately and slave csid halt to follow. In some scenarios
after master csid halt, slave gives violation errors.
With this change we are first changing the halt mode of slave to
internal so that dependency on master is removed and
then issue halt commands to both master and slave.

CRs-Fixed: 2785781
Change-Id: Ib84a8c416e05a4ac54b6afad5c06017931d67a05
Signed-off-by: Shravya Samala <shravyas@codeaurora.org>
2020-10-15 17:35:36 +05:30
Vikram Sharma
5673c12086 msm: camera: isp: removed mutext lock from irq context
get sof timestamp called from tasklet which intern
should not take mutex as it may sleep. This change
removes the mutext lock from irq context.

CRs-Fixed: 2794250
Change-Id: If73acde1a4b931e4bfc3650638f7f977e18cb3ea
Signed-off-by: Vikram Sharma <vikramsa@codeaurora.org>
2020-10-14 09:37:39 -07:00
Shravya Samala
3584602abf msm: camera: tfe: Dont consider vbi for epoch configuration in case of tpg
In case of TPG enabled, vbi value should be not be
consider in calculating epoch configuration because
vbi value passed is in cycles not in terms of lines
when TPG is selected.

CRs-Fixed: 2797039
Change-Id: Ia8870a8c2516fc2e0b3347ccb6b69db3774e33c1
Signed-off-by: Shravya Samala <shravyas@codeaurora.org>
2020-10-14 01:06:47 -07:00
Camera Software Integration
18ef37aa50 Merge "msm: camera: ife: Adjust epoch configuration" into camera-kernel.lnx.4.0 2020-10-13 13:23:49 -07:00
Gaurav Jindal
8974656ba9 msm: camera: ife: Detect RDI only context before acquire hw
In current code, rdi only context is upated after acquiring the
hw. In cases, where the first in_port comes as RDI only and second
in_port comes as Pix and RDI, IFE lite along with Full IFE will
be acquired. Context in question will not be marked as rdi_only.
This causes issues as the interrupts for Lite will be enabled only
if the context is rdi_only. Also, the rdi_only state machine will
not be activated.
To handle such scenarios, before acquiring the hw, we now detect
whether the context is rdi_only. Based on this, hw manager can
pass the information to CSID driver if LITE can be used or not.
Based on this, the reserve call can take decision inside CSID
driver. This information can also be used in advanced targets
where LITE has more capabilities and CSID driver needs more
information to make decisions while reserving hw.
This commit fixes some existing issues of releasing the
resources while handling the early exit from acquire call. It also
adds logging in case there is a failure in acquire because of non
availability of required resources.

CRs-Fixed: 2794147
Change-Id: I0591a83c23504eb67f3b87f17e172a9c67e7c82b
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2020-10-13 16:06:44 +05:30
Tejas Prajapati
4574450a12 msm: camera: common: Merge camera-kernel.3.1 changes in camera-kernel.4.0
msm: camera: cdm: Fix dangling pointer issue
msm: camera: cdm: change work record to atomic variable
msm: camera: utils: Adding device type to track device handles
msm: camera: tfe: Reduce stack footprint during bw vote
msm: camera: req_mgr: Thread switch delay detection mechanisms
msm: camera: cdm: Avoid submitting BL if FIFO is full
msm: camera: tfe: check cdm hang in the tfe config timeout
msm: camera: req_mgr: Delay detection mechanism
msm: camera: cdm: Debug info in case of cdm page fault
msm: camera: isp: Max context reduction for TFE in isp driver
msm: camera: ope: Maintain current clock value during acquire
msm: camera: req_mgr: Limit CAM_ERR log in case of no empty task
msm: camera: cdm: Decrement write-count only after Bl commit
msm: camera: isp: Added CSID recovery mechanism.

CRs-Fixed: 2792394
Change-Id: I1c7a903ae15b572acf3f6318cda7394cb6549c8d
Signed-off-by: Tejas Prajapati <tpraja@codeaurora.org>
2020-10-13 12:08:01 +05:30
Camera Software Integration
fabd1f7b0a Merge "msm: camera: cpas: Add qosgen shaping config" into camera-kernel.lnx.4.0 2020-10-12 12:55:58 -07:00
Camera Software Integration
7aaa9af364 Merge "msm: camera: cpas: Add cpas support for camera v680 platform" into camera-kernel.lnx.4.0 2020-10-12 12:55:26 -07:00