提交線圖

2109 次程式碼提交

作者 SHA1 備註 日期
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
Jigarkumar Zala
45bae36861 msm: camera: csiphy: Add version check for secure mask
CSIPHY version 2_1_0, secure phy mask is different for csiphy
hw 0/1/2/3  and hw 4/5. This needs to be configure before enabling
secure lanes. This change adds the appropriate version check to
perform this operation.

CRs-Fixed: 3039500
Change-Id: I8e856757886e880a6bf57ed4083ddf99cd325a7a
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2021-09-20 11:25:54 -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
Camera Software Integration
e589c42a5b Merge "msm: camera: isp: Program MUP at stream on" into camera-kernel.lnx.5.0 2021-09-18 12:49:44 -07:00
Camera Software Integration
0a2a2dca28 Merge "msm: camera: reqmgr: Correct masked value for pending devices" into camera-kernel.lnx.5.0 2021-09-17 16:37:37 -07:00
Karthik Jayakumar
f31aaa8d2d msm: camera: jpeg: Add null check for ctx_data in IRQ handler
Check if ctx_data is null after assignment but before checking if it's in use.

CRs-Fixed: 3026736
Change-Id: I366383cbd30b7c22c16610d7b73e4e0ad8f74a55
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2021-09-17 16:03:07 -07:00
Mukund Madhusudan Atre
ead982b872 msm: camera: isp: Add fixes for buf done in presil
Currently, during verification of consumed address, we are not
taking into account the exapanded memory address that newer
targets have. Also, we are using wrong index for fence map
table, leading to supplying same resource handle for copying
buffer of different fence map entry, leading to empty frame.
Add correct comparision for consumed address and supply correct
index for fence map entry.

CRs-Fixed: 2932495
Change-Id: I1743d894ce47a51f2d93dc185865bb47b7655c05
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-09-16 20:02:34 -07:00
Jigar Agrawal
09cb87689f msm: camera: reqmgr: Add more error codes in uapi file
Add support for more error codes in the kernel code to
report more errors to user.

CRs-Fixed: 3026930
Change-Id: I430b26c285f1c9fcf0a4d7bb9a618bbbf7bf0662
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-09-16 17:50:15 -07:00
Camera Software Integration
624ee237ea Merge "msm: camera: sensor: Handle tpg shutdown properly" into camera-kernel.lnx.5.0 2021-09-16 16:37:54 -07:00
Camera Software Integration
36992ffa10 Merge "msm: camera: ife: Null pointer check for dump_data" into camera-kernel.lnx.5.0 2021-09-16 16:37:43 -07:00
Karthik Anantha Ram
35ad993892 msm: camera: isp: Program MUP at stream on
All the paths that are enabled program their RUP/AUP
respectively. At the end of that program MUP as well via
AHB. The change also removes programming MUP for scratch buffers.

CRs-Fixed: 3038703
Change-Id: I3b6b23bb9c6b7644b5943815253b965a40080973
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-09-16 14:20:28 -07:00
Shadul Shaikh
083480979f msm: camera: smmu: Unmap secure buffers in secure camera use case
Dettach and unmap DMA buffers obtained previously from DMA attach
and mappings respectively.

CRs-Fixed: 3014632
Change-Id: If8f8ebe9fc270f2ba39a9a42ab7c7bfb0f79c4eb
Signed-off-by: Shadul Shaikh <sshadu@codeaurora.org>
2021-09-15 12:23:50 -07:00
Haritha Chintalapati
4606441bc4 Merge "msm: camera: csiphy: Update the datarate settings for csiphy" into camera-kernel.lnx.5.0 2021-09-14 17:44:48 -07:00
Savita Patted
3d03b508ac Merge "msm: camera: smmu: Use device node to print node name" into camera-kernel.lnx.5.0 2021-09-13 17:35:03 -07:00
Savita Patted
ab01bad543 Merge "msm: camera: isp: Fix IFE and CSID presil issues for v780" into camera-kernel.lnx.5.0 2021-09-13 17:34:37 -07:00
Tony Lijo Jose
1ac3215b14 msm: camera: sensor: Handle tpg shutdown properly
CPAS stops during shutdown needs to be done only for the TPGs which has
done the cpas start. This change add the state checks while tpg reset.

CRs-Fixed: 2998830
Change-Id: I4cdd9ec74daa65999ed5094a3c4a4c165b9a1569
Signed-off-by: Tony Lijo Jose <tjose@codeaurora.org>
2021-09-13 15:21:26 +05:30
Sujit Das
42e600ac01 msm: camera: ife: Null pointer check for dump_data
When pipeline is IFE_Lite and IFE_LITE doesn't define dump_data,
Need to have null check for dump_data.

CRs-Fixed: 2980840
Change-Id: Icb3322b82b265829e4a54271fa30260a00f90175
Signed-off-by: Sujit Das <sujitd@codeaurora.org>
Signed-off-by: Dharmender Sharma <dharshar@codeaurora.org>
2021-09-13 11:36:06 +05:30
Camera Software Integration
5dff9c5e96 Merge "msm: camera: jpeg: Add buffer copy mechanism for jpeg" into camera-kernel.lnx.5.0 2021-09-10 18:10:23 -07:00
Camera Software Integration
cfa89c05e4 Merge changes Ifd1e0fdb,Icfb6dc1a into camera-kernel.lnx.5.0
* changes:
  msm: camera: common: Add buffer send and receive mechanism
  msm: camera: memmgr: Add presil memory API implementation
2021-09-10 18:09:09 -07:00
Camera Software Integration
207895b464 Merge "msm: camera: reqmgr: Notify devices of frame skip" into camera-kernel.lnx.5.0 2021-09-10 18:08:36 -07:00
Camera Software Integration
37ee4d8f75 Merge "msm: camera: isp: CSID Tasklet stop sequence" into camera-kernel.lnx.5.0 2021-09-10 18:08:26 -07:00
Camera Software Integration
a0cf19db66 Merge "msm: camera: reqmgr: Change warn logs to rate limited" into camera-kernel.lnx.5.0 2021-09-10 18:08:16 -07:00
Jigar Agrawal
4896462b8d msm: camera: cdm: Enhance CSID logs for debug purpose
Enable the csid long packet and cphy packet capture
feature to log the VC, DT and WC info during the error IRQ.

CRs-fixed: 3029730
Change-Id: I86c3400b58ecd5243d93b0fbbe0d4a38f895320e
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-09-10 14:59:52 -07:00
zhuo
5ce3274d14 msm: camera: common: Add context flush state check
This commit add context flush state check to avoid invalid flush.

CRs-Fixed: 3034117
Change-Id: I45192f6b6255ffefedefe869badf04448dfaa5f6
Signed-off-by: zhuo <zhuo@codeaurora.org>
2021-09-10 19:05:12 +08:00
Savita Patted
c39072a0f2 Merge "msm: camera: isp: Reduce IRQ top half IO operations" into camera-kernel.lnx.5.0 2021-09-09 18:22:49 -07:00
Savita Patted
d176f599c8 Merge "msm: camera: isp: Add YUV format support" into camera-kernel.lnx.5.0 2021-09-09 18:22:10 -07:00
Mukund Madhusudan Atre
9d3054dddd msm: camera: jpeg: Add buffer copy mechanism for jpeg
Add support for copying buffers to and from presil in
jpeg.

CRs-Fixed: 2932495
Change-Id: I0ca7069feae3f063259d88f1d02177de9675388a
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-09-09 12:41:26 -07:00
Mukund Madhusudan Atre
5dba22d1fc msm: camera: common: Add buffer send and receive mechanism
Add packet based buffer send and retrieve mechanism for
presil testing.

CRs-Fixed: 2932495
Change-Id: Ifd1e0fdb8b12feabb884e02a07a3813db01a3899
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-09-09 12:41:00 -07:00
Suraj Dongre
37de6613a8 msm: camera: memmgr: Add presil memory API implementation
Add code for dmabuf, fd conversion and copying all buffers
using presil framework APIs.

CRs-Fixed: 2932495
Change-Id: Icfb6dc1a3326ea8214a71fd39871a8583a6e902c
Signed-off-by: Suraj Dongre <sdongre@codeaurora.org>
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2021-09-09 12:40:34 -07:00
chengxue
a9396b2953 msm: camera: smmu: Use device node to print node name
Printk format %pOFfp is used to print node name,
but we just can use this format to print device node
structure.

CRs-Fixed: 3028231
Change-Id: If703b81acb0b85f0eca7d6dc9ebfd875d86e2f3a
Signed-off-by: chengxue <chengxue@codeaurora.org>
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2021-09-09 17:06:45 +08:00
Camera Software Integration
9b31a3dc93 Merge "msm: camera: isp: Change format specifier for hbi-vbi print" into camera-kernel.lnx.5.0 2021-09-08 17:49:08 -07:00
Camera Software Integration
3fbc4c58c4 Merge "msm: camera: cdm: Acquire mutex lock before accessing client data" into camera-kernel.lnx.5.0 2021-09-08 17:48:55 -07:00
Camera Software Integration
ca78a33308 Merge "msm: camera: cre: Fix typo error for copying blob args" into camera-kernel.lnx.5.0 2021-09-08 17:48:43 -07:00
Camera Software Integration
4e72306ca5 Merge "msm: camera: isp: Update latency buffer allocation in header" into camera-kernel.lnx.5.0 2021-09-08 17:48:30 -07:00
Depeng Shao
b5d455f995 msm: camera: reqmgr: Change warn logs to rate limited
In notify trigger and if link state isn't ready, it may
print excessive log which causes watchdog bite.

CRs-Fixed: 3031599
Change-Id: I758dcb26d9d110b0ba080e31f87e1fcafc6fd0e8
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2021-09-08 18:50:42 +08:00
Karthik Anantha Ram
4f751b3daf msm: camera: reqmgr: Correct masked value for pending devices
When checking if a request is ready, for pending devices of a
given pipeline delay, update the request pending mask correctly.
This will ensure "Skip frame" log indicates the right devices
missing a request packet.

CRs-Fixed: 3031843
Change-Id: Ib2aff1d0c31cb9425616ff53cadd78a6130206e7
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2021-09-07 23:45:51 -07:00
Depeng Shao
e73c1b91e1 msm: camera: reqmgr: Notify devices of frame skip
Notify devices of frame skip when CRM skip a frame,
this is needed by SW frame sync.

CRs-Fixed: 3030315
Change-Id: If99cd976c215fe85c8f9fc600af22a82bb972917
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2021-09-08 14:22:03 +08:00
Chandan Kumar Jha
d0065e3469 msm: camera: isp: Fix IFE and CSID presil issues for v780
Timestamp enable field moved from path config 1 
to path config 0 register in CSID 780 HW. This
change will enable global timestamp for CSID 780.

Buff-done IRQ mask is changed and Bits 11 and 12
are reserved in CSID 780. This change will create
the correct buff-done mask for RDI and PD clients.

CRs-Fixed: 2948116
Change-Id: Id239f6e7b360853c2d1ed1155c069d2d44e041e7
Signed-off-by: Chandan Kumar Jha <cjha@codeaurora.org>
2021-09-07 21:31:29 -07:00
Camera Software Integration
ffe52eafd6 Merge "msm: camera: isp: Program rup/aup for scratch only at run time" into camera-kernel.lnx.5.0 2021-09-07 18:10:13 -07:00
Camera Software Integration
d8c08cf514 Merge "msm: camera: common: Add QMAA compliance to camera dlkms" into camera-kernel.lnx.5.0 2021-09-07 18:10:00 -07:00
Camera Software Integration
aa9465aa62 Merge "msm: camera: isp: Skip exposure config for resources with no read" into camera-kernel.lnx.5.0 2021-09-07 18:08:49 -07:00
Camera Software Integration
ee5a543ba4 Merge "msm: camera: csiphy: Update the datarate settings for csiphy" into camera-kernel.lnx.5.0 2021-09-07 18:08:33 -07:00
Jigar Agrawal
bb09d36188 msm: camera: csiphy: Update the datarate settings for csiphy
Update the csiphy datarate setting for 2.35gsps slab.

CRs-Fixed: 3022770
Change-Id: I61316aa83debbcc49fae95ef1ebac092a794236f
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2021-09-07 10:29:34 -07:00
Anand Ravi
37ffa2cf3b msm: camera: isp: Reduce IRQ top half IO operations
In the IRQ controller top half, registers which do not belong to any
event should not be read since they are not going to be processed
further.

Also, issue the global clear after top half processing to accommodate
cases where two controllers share a common global clear and one is
triggered by the other. This change adds support for this by introducing
functions to explicitly define such dependencies.

CRs-Fixed: 2846451
Change-Id: Ie5df596bc3f342550c08f172647ad0cb5ed3f3c7
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2021-09-07 09:57:48 -07:00
Yash Upadhyay
9140aa520b msm: camera: isp: CSID Tasklet stop sequence
Handle race for tasklet stop. Changed the sequence of tasklet stop
call to avoid unclocked register accesses on tasklet stop/flush.

CRs-Fixed: 3010894
Change-Id: Ieec9f20db127b2bebec0bb40ec437b4eb3d3d9dd
Signed-off-by: Yash Upadhyay <yupadhya@codeaurora.org>
2021-09-07 12:46:36 +05:30
Shravya Samala
e647fae22b msm: camera: cdm: Acquire mutex lock before accessing client data
There is a chance of use after release of client data in
cdm internal operation calls. Hence acquire mutex lock whenever
accessing client data to avoid use after release scenario.

CRs-Fixed: 3010261
Change-Id: Iaf7f41d56301299a6f63a5dc1090334063019881
Signed-off-by: Shravya Samala <shravyas@codeaurora.org>
2021-09-06 04:52:07 -07:00
Gaurav Jindal
919e62d01e msm: camera: isp: Add YUV format support
Add YUV format support in ISP driver. This change is
needed to support the requirement of many OEM who
are trying to bring up YUV sensors.
This commit adds support for YUV 422 8 bit and YUV422 10 bit
format using IPP and RDI path.

CRs-Fixed: 3025233
Change-Id: I61c5881bc655451a6aa6aebe6d6bbf520597a473
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2021-09-06 09:01:18 +05:30
Camera Software Integration
0794e0fa6b Merge "msm: camera: req_mgr: Apply lower pd request in sync" into camera-kernel.lnx.5.0 2021-09-03 14:30:20 -07:00
Camera Software Integration
cea86bb84b Merge "msm: camera: reqmgr: Fix pagefault in workqueue get task" into camera-kernel.lnx.5.0 2021-09-03 14:30:11 -07:00