Wykres commitów

1018 Commity

Autor SHA1 Wiadomość Data
Savita Patted
88de9bde7d Merge "msm: camera: isp: Add common utility functions" into camera-kernel.lnx.5.0 2021-10-15 23:35:09 -07:00
Savita Patted
ad95974a84 Merge "msm: camera: isp: Split event handler based on HW type" into camera-kernel.lnx.5.0 2021-10-15 23:34:50 -07:00
Savita Patted
a89651c3b0 Merge "msm: camera: isp: Apply scratch only on SOF trigger" into camera-kernel.lnx.5.0 2021-10-15 23:34:34 -07:00
Camera Software Integration
6432cff2d8 Merge "msm: camera: ife: Program image addr for once in RDI batch mode" into camera-kernel.lnx.5.0 2021-10-14 16:55:48 -07:00
Camera Software Integration
c469b0db2d Merge "msm: camera: common: Make msg_cb for cam_subdev generic" into camera-kernel.lnx.5.0 2021-10-14 16:55:23 -07:00
Karthik Anantha Ram
b48f4da577 msm: camera: isp: Add common utility functions
Add common utility functions to be used across isp
context. Util functions added to notify trigger points,
notify errors, pause CRM SOF timer and trigger register dumps.
The change also modifies certain pointer validations to
accomplish this.

CRs-Fixed: 3045706
Change-Id: I3cb19e9a24ffb82ff25e7c278b31a8bf0e854eed
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-10-13 11:42:08 -07:00
Karthik Anantha Ram
69919eb973 msm: camera: isp: Split event handler based on HW type
Based on whether the event posted to HW mgr is from CSID/IFE/SFE,
handle them accordingly. This change avoids breaking off new
functions in existing calls for different events, instead
have an independent handler for each HW type.

CRs-Fixed: 3045706
Change-Id: I139514d9028c6d613f1bc7403014474dc336df34
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-10-13 11:41:38 -07:00
Karthik Anantha Ram
498012e556 msm: camera: isp: Apply scratch only on SOF trigger
It's possible that CRM triggers frame skip call at SOF
and EOF. For IFE ignore the call on EOF. Only use
SOF trigger to apply default settings [scratch buffers],
for fetch engine use-cases.

CRs-Fixed: 3055035
Change-Id: Ic0b59e5beb6dff70bb1b515117f0b641d8e09308
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-10-13 11:40:17 -07:00
Camera Software Integration
21d78e35c1 Merge "msm: camera: common: Add wrapper for presil locking" into camera-kernel.lnx.5.0 2021-10-12 19:30:53 -07:00
Haritha Chintalapati
cc34998f9a Merge "msm: camera: isp: Handle RUP for enabled CSID CAMIF IRQs" into camera-kernel.lnx.5.0 2021-10-11 21:10:13 -07:00
Haritha Chintalapati
ace7a6a26e Merge "msm: camera: isp: Fix BW voting corruption in top layer" into camera-kernel.lnx.5.0 2021-10-11 21:09:52 -07:00
Suraj Dongre
1d86110d7b msm: camera: common: Add wrapper for presil locking
Presil IRQ handling requires running in a workqueue, with
wait for acknowledgement in io operations. This busy wait
should be done while holding a mutex lock as opposed to
spinlock in usual irq context. Add wrapper to switch from
spinlock to mutex for presil mode in irq controller and
cdm. Add the hw lock wrapper in hw interface header.

CRs-Fixed: 2932495
Change-Id: I7600eb1e6ae8746a39e76f6cb3a2652b255f2ddd
Signed-off-by: Suraj Dongre <sdongre@codeaurora.org>
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-10-11 10:34:34 -07:00
Savita Patted
c38139d8da Merge "msm: camera: cpas: Add support for Diwali Camera" into camera-kernel.lnx.5.0 2021-10-08 17:20:40 -07:00
Mukund Madhusudan Atre
5c479c94dd msm: camera: isp: Fix BW voting corruption in top layer
Currently, the structure used to aggregate incoming votes
from ife hw manager is declared as static. This is an issue
in case of multi-context camera. Add the aggregated incoming
vote entry in VFE/SFE top so that it is accessed per HW core only.

CRs-Fixed: 3008062
Change-Id: Ib174925cba3aeb86b8704fc68d6f444f476f01e6
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-10-07 09:38:11 -07:00
Gaurav Jindal
931927867f msm: camera: isp: Handle RUP for enabled CSID CAMIF IRQs
CAMIF interrupts in CSID are enabled based on use case requirements.
In additionto this, inside hw manager propagation to isp context is
again dependent on the same checks. Since the enabling is based
on use-case, the checks in the handler functions are redundant.
With upgrades in hardware, the checks are increasing while handling
in hw manager.
This commit removes the checks in handler function in hw manager.

CRs-Fixed: 3052221
Change-Id: I44f59b782dba0f7e7eb20c2ace56f3094527932b
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2021-10-07 14:33:55 +05:30
Camera Software Integration
af97f4555c Merge "msm: camera: isp: Add header file VFE and CSID for Diwali" into camera-kernel.lnx.5.0 2021-10-06 17:45:17 -07:00
Camera Software Integration
f37941cead Merge "msm: camera: isp: shdr enable pdaf occur overflow" into camera-kernel.lnx.5.0 2021-10-06 17:41:00 -07:00
Camera Software Integration
ce1580456e Merge "msm: camera: isp: Update last applied MUP for scratch" into camera-kernel.lnx.5.0 2021-10-06 17:40:24 -07:00
Camera Software Integration
7506e430e7 Merge "msm: camera: isp: Add bw info dump on clk/bw update error" into camera-kernel.lnx.5.0 2021-10-06 17:36:40 -07:00
Ayush Kumar
da55dd5e51 msm: camera: cpas: Add support for Diwali Camera
Diwali has different version of CPAS version which
requires camnoc interface changes and CPAS version
change. This change adds the same.

CRs-Fixed: 3043114
Change-Id: I698b251c43d34225053ab3a0e9c581201d6be638
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2021-10-05 23:34:39 +05:30
Camera Software Integration
4c38664b95 Merge "msm: camera: isp: Reduce traffic for shutter notification" into camera-kernel.lnx.5.0 2021-10-04 17:32:47 -07:00
Mukund Madhusudan Atre
2f9b9f590b msm: camera: isp: Add bw info dump on clk/bw update error
Add blob info dump on finish clock/bw update error to provide
insight into what userspace has sent in packet. Also, print the
history of bw votes to check values coming from HW manager.

CRs-Fixed: 3039737
Change-Id: Ifc4df6bb7d4a3cf03715300e9edd1d3987df4a4c
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-10-04 10:24:21 -07:00
Shardul Bankar
dc53926c40 msm: camera: common: Make msg_cb for cam_subdev generic
The current implementation allows to pass uint_32 as
argument in the message callback. Changing it to (void *)
type so that any type of data can be passed in the future
implementations.

CRs-Fixed: 2847155
Change-Id: Ic52a5ccfe13efdba37bbcfdb7154ed789b1943fd
Signed-off-by: Shardul Bankar <sharbank@codeaurora.org>
2021-10-04 15:05:10 +05:30
Ayush Kumar
31d8b11c65 msm: camera: isp: Add header file VFE and CSID for Diwali
This commit adds VFE/CSID header file changes for titan
version 570 hardware.

CRs-Fixed: 3043114
Change-Id: Ibddb9b69a17d6a7bed8b8ea802a3fce0199966e9
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2021-10-03 21:19:11 -07:00
Camera Software Integration
81e99709c3 Merge "msm: camera: isp: Add support of PDAF parsed outport" into camera-kernel.lnx.5.0 2021-10-01 19:50:07 -07:00
Camera Software Integration
87d033316b Merge "msm: camera: isp: Don't clear lists when disabling all events" into camera-kernel.lnx.5.0 2021-09-30 17:54:16 -07:00
Camera Software Integration
9cbace3d87 Merge "msm: camera: isp: Correct the wrong res id" into camera-kernel.lnx.5.0 2021-09-30 17:53:36 -07:00
Pranav Sanwal
0ddfe2d482 msm: camera: isp: Reduce traffic for shutter notification
To reduce traffic for shutter notification, sof and boot
sof timestamps are sent in a unified v4l2 event.
Thereby, reducing the event notification traffic by 50%.

CRs-Fixed: 3040374
Change-Id: Ib4580e0a4df7c3d1cb892fdf3254272d3134d4cb
Signed-off-by: Pranav Sanwal <psanwal@codeaurora.org>
2021-09-30 18:05:29 +05:30
chengxue
10b575f21e msm: camera: isp: shdr enable pdaf occur overflow
If we config stream in order like IMAGE/IMAGE_SHORT/
PDAF, while PDAF stream reserve, it will override
sfe_inline_shdr flag to false on csid_hw, and we
can not configure the master/slave register correctly,
so we move the common sfe_inline_shdr flag to path cfg.

CRs-Fixed: 3047943
Change-Id: Ie4a863e9aa24a142c5c4b3c90553e4a2bd92d7f3
Signed-off-by: chengxue <chengxue@codeaurora.org>
2021-09-30 10:49:17 +08:00
Camera Software Integration
a6d54a3219 Merge "msm: camera: req_mgr: Allow request cancellation if not applied to IFE" into camera-kernel.lnx.5.0 2021-09-29 15:57:59 -07:00
Camera Software Integration
ae8ace5996 Merge "msm: camera: isp: Increase max dependents of IRQ controller" into camera-kernel.lnx.5.0 2021-09-29 15:57:38 -07:00
Karthik Anantha Ram
54f158a4fe msm: camera: isp: Update last applied MUP for scratch
In case of sHDR dynamic switch, for a frame on which we are
configuring scratch buffer, use MUP from the last applied
valid request as opposed to global reference of MUP held
by the CSID driver. The global reference could have been
updated by a future request, it would be incorrect to use
that when that request has not even been applied.

CRs-Fixed: 3038703
Change-Id: I9369dba80fa258925ab4ae573b33931352318334
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-09-28 20:21:04 -07:00
Camera Software Integration
02f11b69c4 Merge "msm: camera: common: Update bytes written variable" into camera-kernel.lnx.5.0 2021-09-28 16:43:55 -07:00
Camera Software Integration
5e9afd31bf Merge "msm: camera: isp: Add PID MID support for SFE" into camera-kernel.lnx.5.0 2021-09-28 16:43:32 -07:00
Depeng Shao
5cb86d5101 msm: camera: isp: Correct the wrong res id
This change corrects the wrong res id during checking
whether ife lite can be used in current usecase.

CRs-Fixed: 3046530
Change-Id: Ic24848fcd4aa85172e334a9de81c69dcdc9838cf
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2021-09-28 16:13:52 +08:00
Camera Software Integration
740459b9f8 Merge "msm: camera: isp: Fix comp mask calculation during buf done" into camera-kernel.lnx.5.0 2021-09-27 17:10:31 -07:00
Camera Software Integration
84a665ef5c Merge "msm: camera: common: Fix kernel code and add checks" into camera-kernel.lnx.5.0 2021-09-27 15:37:10 -07:00
Camera Software Integration
fbced33fa6 Merge "msm: camera: isp: Add fixes for buf done in presil" into camera-kernel.lnx.5.0 2021-09-27 15:36:42 -07:00
Camera Software Integration
094aa60747 Merge "msm: camera: cdm: Enhance CSID logs for debug purpose" into camera-kernel.lnx.5.0 2021-09-27 15:36:23 -07:00
Anand Ravi
0417e88967 msm: camera: req_mgr: Allow request cancellation if not applied to IFE
Since we don't wait for requests to be ready on lower pd devices before
applying request on higher pd devices, add provision to cancel request
if it has not been applied on IFE.

CRs-Fixed: 3014942
Change-Id: I8850b0dfe3f88e04b86f7bb6b597657ad7e0a4f9
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-09-27 14:41:03 -07:00
Tejas Prajapati
4c6b819ea7 msm: camera: ife: Program image addr for once in RDI batch mode
For RDI only batch mode use case currently image address
is programmed as many times as the batch count this is
causing a page fault with unmapped VA.
In RDI only use case the image address needs to
be programmed only once the consecutive image address is
taken from the frame increment address and image address
programmed with first frame of the batch.

CRs-Fixed: 3031033
Change-Id: I2c463125bf3b5731bcbd92bb15b364724fba45db
Signed-off-by: Tejas Prajapati <tpraja@codeaurora.org>
2021-09-27 12:28:50 +05:30
Anand Ravi
c213491c20 msm: camera: isp: Don't clear lists when disabling all events
On overflow, cam_irq_controller_disable_all function is called from top
half handler, which itself is in a loop of all entries of top half list.
Manipulating the list to remove all elements can leave it in an unstable
state and cause the loop to never terminate. Since events are removed
from all lists when unsubscribing from the IRQs, do not clear the top
half list when disabling all events.

CRs-Fixed: 3043489
Change-Id: Idee0a017cdea1dac73e9a7a00f07463afe324983
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-09-26 10:27:22 -07:00
Anand Ravi
b5a3c6c3bc msm: camera: isp: Increase max dependents of IRQ controller
SFE has two dependent controllers - bus write and bus read. Currently,
it max dependents is set to one so increase maximum dependents to fix
dependency registration failure.

CRs-Fixed: 3044375
Change-Id: Ib02490ef0016943d979506288d6192558b380534
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-09-24 13:03:02 -07:00
Gaurav Jindal
03dedba588 msm: camera: common: Update bytes written variable
While dumping minidump information, bytes updated are wrongly
updated. This commit corrects that condition.

CRs-Fixed: 3044173
Change-Id: I5a6ac915118424b6ec3a2e64726786ed0e47c9c7
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2021-09-24 21:54:41 +05:30
Chandan Kumar Jha
738df632cc msm: camera: isp: Add support of PDAF parsed outport
Add support of new PDAF Parsed data outport for VFE 780.

CRs-Fixed: 2948116
Change-Id: Icd88e3947f6c1461c49ef6912985836931a1c62b
Signed-off-by: Chandan Kumar Jha <cjha@codeaurora.org>
2021-09-24 15:52:49 +05:30
Gaurav Jindal
8b1c004eac msm: camera: isp: Add PID MID support for SFE
This commit adds support for printing PID and MID in case
of page faults on SFE.

CRs-Fixed: 3040816
Change-Id: I99f8c6de6049802f7c67a72daf6c3fb24c3defb1
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2021-09-23 18:51:09 +05:30
Anand Ravi
d7eb296004 msm: camera: isp: Reset fence after signalling success
If fence is signalled successfully, reset it to -1 to prevent it from
getting signalled again incorrectly.

CRs-Fixed: 3042511
Change-Id: I87f465508e9e626ad700f592478f253f179e9fe9
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-09-22 15:05:54 -07:00
Mukund Madhusudan Atre
95cee39ce8 msm: camera: isp: Fix comp mask calculation during buf done
Currently, the shifted value we are providing to comp mask is
32-bit. The number of output ports have increased beyond 32,
and it requires for the correct bit to be set to report buf
done to context correctly. Extend the mask value calculation
to 64-bit.

CRs-Fixed: 2948116
Change-Id: I70e30fc44c178c04d0e962a31e4c48e3e5a13e75
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-09-21 12:41:25 -07:00
Jigar Agrawal
35a9822e03 msm: camera: common: Fix kernel code and add checks
Fix Kernel code and add security checks to avoid
possible null pointer dereference, out of bound
array access and accessing the uninitialized
variables. This change resolves following static
analysis issues:
568, 576, 577, 578, 4828, 4829, 4830, 4831, 4832,
4833, 4834, 4835, 4836, 4839, 4841, 4842, 5849,
9352, 9454, 9455.

CRs-fixed: 3038735
Change-Id: I16e437edbb444223ce9d275ed55089bd25a1294c
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-09-21 10:42:19 -07:00
Depeng Shao
c8ac17dee6 msm: camera: reqmgr: Fix request sync issues
Fix several request sync issues.

CRs-Fixed: 3029196
Change-Id: I92b4048b392fa19e2c9748a5ee0efd9ef0b4e680
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2021-09-20 13:04:31 +08:00