Commit Graph

3212 次程式碼提交

作者 SHA1 備註 提交日期
Vijay Kumar Tumati
262502722c msm: camera: csiphy: Remove the references to a unused header
The file is supposed to be included only from the userspace
drivers and not from the kernel space drivers. The other
files included in the camera drivers are sufficient for
referencing the necessary symbols.

CRs-Fixed: 3562596
Change-Id: Ie8f54d07767b1c12b36f381c0f951b15953d9e7c
Signed-off-by: Vijay Kumar Tumati <quic_vtumati@quicinc.com>
(cherry picked from commit 8f51e330a824ec89b32d60ae501ac3edaba7ed2c)
2023-09-21 12:05:11 -07:00
Stark Lin
8a04130f3b msm: camera: isp: Dump imp CSID regs during timeout
This change dumps important csid registers and clock info
during sw reset timeout.

CRs-Fixed: 3583444
Change-Id: Iac8f45343058766012c19b8d61fa9e541e8a2b76
Signed-off-by: Stark Lin <quic_starlin@quicinc.com>
2023-09-22 00:00:32 +05:30
Ayush Kumar
17b595a936 msm: camera: isp: Logging improvement
This commit add change to print vcrop register during
illegal programming error.

CRs-Fixed: 3595942
Change-Id: If09d8c1240556618dbc6c40e1e22938e187618ff
Signed-off-by: Ayush Kumar <quic_ayushkr@quicinc.com>
2023-09-20 04:42:48 -07:00
Shravan Nevatia
ed308a3020 msm: camera: sensor: Fix mutex handling in TPG driver
Issue:
TPG driver doesn't release the device mutex when the stop/
configure commands fail.

Fix:
Release the mutex everytime it's acquired in TPG driver.

Change-Id: I8414c73b89e1e69b60682d860ec1d97d6a7a8dbc
CRs-Fixed: 3594995
Signed-off-by: Shravan Nevatia <quic_snevatia@quicinc.com>
(cherry picked from commit 7b9602e996781f36a79c514780d1f776f5dfda8a)
2023-09-18 09:30:52 +05:30
mingpan
87406c4947 msm: camera: reqmgr: Pause watch dog before internal recovery
Need to pause watch dog before internal recovery because the recover
may take a long time. if don't pause watch dog here, SOF freeze may
be triggered. After recovery, need to start watch dog again.

CRs-Fixed: 3588849
Change-Id: I5209cbc1b71c7f9a68dd3ee6097da1eb6facbb40
Signed-off-by: mingpan <quic_mingpan@quicinc.com>
(cherry picked from commit b02ec3ea0706ea6b578162ec58af432d61be9cda)
2023-09-18 09:30:32 +05:30
Depeng Shao
f1ba516e2f msm: camera: isp: Add input core to hw idx for sfe2
This change adds input core type to hw idx support
for sfe2, ife hw manager needs the hw idx to notify
sfe2 of the overflow event.

CRs-Fixed: 3602081
Change-Id: I94f43e80ddad1689508c1709b1c134fedbcb034b
Signed-off-by: Depeng Shao <quic_depengs@quicinc.com>
(cherry picked from commit 8dde5b8efdd0ee5f12347762c2e90f2c05bdd41f)
2023-09-18 09:30:10 +05:30
Depeng Shao
133370a30c msm: camera: cci: Don't validate queue for lock and unlock cmd
We already reserve the space for unlock cmd during loading the
data to CCI queue, so we don't need to validate the queue before
loading unlock cmd to the queue.

CRs-Fixed: 3603432
Change-Id: Ie1acee0c09446d5a60a0f80e1393800600306412
Signed-off-by: Depeng Shao <quic_depengs@quicinc.com>
(cherry picked from commit f9ca5a4b9a0b5a6dfec4d8881d0e183068596bf9)
2023-09-18 09:29:52 +05:30
Dharmender Sharma
c6b1ce8455 msm: camera: cpas: Add support for Cliffs Camera
This change adds camnoc interface changes and CPAS version change for
Cliffs camera. It also add support for ife, csid and sfe.

CRs-Fixed: 3609762
Change-Id: Icddfd38330022b8ebc7f785ba3c97cc055e70d74
Signed-off-by: Dharmender Sharma <quic_dharshar@quicinc.com>
2023-09-12 23:45:46 -07:00
Yash Upadhyay
560a401558 msm: camera: isp: Enabling last consumed address support in tfe
Enabling last consumed address support to handle delay in bufdones.

CRs-Fixed: 3273866
Change-Id: I25df0ac7a81b696188519db8df08c66a238e1644
Signed-off-by: Yash Upadhyay <quic_yupadhya@quicinc.com>
(cherry picked from commit 8bdd7e9d45f7ff51a893bca833343e0fce1efd65)
2023-09-11 22:37:20 +05:30
Yulei Yao
0b8ef446fb msm: camera: sensor: Fix delay pass issue in I2C sequential write
When I2C sequential write is applied, first register's delay parameter
is used instead of the last one in the sequential queue.

CRs-Fixed: 3566036
External Impact: No.

Change-Id: I0aa6480d7b577fdb697bc28b61aed428d5cae8fb
Signed-off-by: Yulei Yao <quic_yuleiy@quicinc.com>
(cherry picked from commit e2ebd508d879607b2dadb1d223c1ad7338989bf2)
2023-09-11 22:35:32 +05:30
Haochen Yang
4722b4c478 msm: camera: isp: Add support for handling FCG configurations
This change parses FCG configurations from UMD, handles it
in its corresponding blob handler, then writes exact FCG configs
to the hardware.

During the prepare stage, all FCG update values will be temporarily
stored in req_isp and then utilized by the config function later.
At the end of the blob handler with FCG prepared, a dummy hw update
entry is created for further usage and the size of such entry is based
on the number of reg val pairs and the size of cdm reg random header.

During applying the req in activated state, an algorithm is implemented
to pick exact FCG prediction to be used in SFE/IFE/TFE usecases.

During the config stage, based on the number of skipped frames before,
the exact FCG configurations are passed to SFE/VFE top and then
written into kmd_buf and picked by the CDM. If the number of skipped
frames reaches the maximum that FCG supports or no recorded skipped
frames before, current configuration will be used instead and FCG
entry will be skipped. If the hardware supports multi context like TFE,
wr_sel will be programmed right before the FCG config of each context.

In order to retrieve cpu address of FCG related hw update entry,
a slight change is made in packet parser to pass those addresses
when adding hw update entries.

CRs-Fixed: 3487116
Change-Id: I1db957885933edcbfabc6ce90d72902f4c518118
Signed-off-by: Haochen Yang <quic_haocyang@quicinc.com>
(cherry picked from commit 55213f81a4bd9a847692c00e657e722c1d4ed903)
2023-09-06 00:17:45 +05:30
Haochen Yang
69f7756ed0 msm: camera: uapi: Add support for FCG configuration
This change adds structs in uapi to carry update values
for SFE/IFE/MC_TFE FCG configurations.

CRs-Fixed: 3487116
Change-Id: Ia3202ccf9649375725b8ee1b8f721347d1399a88
Signed-off-by: Haochen Yang <quic_haocyang@quicinc.com>
(cherry picked from commit 989c22e0b775faaaa72479cab3bbac629203381b)
2023-09-06 00:17:38 +05:30
Depeng Shao
38a96f694c msm: camera: cci: Fix some cci stability issues
This change moves the set parameter under lock
context to make sure all the cmds are atomic.
This change also move the unlock at the end
of writing data, then we don't need to get
inflight word count and write back to execute
word count to fix underflow issue.

CRs-Fixed: 3589051
Change-Id: I1c16a204e41e6af22a23e9249c82f541e7e6e21a
Signed-off-by: Depeng Shao <quic_depengs@quicinc.com>
(cherry picked from commit dda071b3e2e76a2d698a40c8829da0627bd80da2)
2023-08-26 02:58:12 -07:00
Camera Software Integration
573c73d3df Merge "msm: camera: isp: Apply MUP at streamon correctly" into camera-kernel.lnx.7.0 2023-08-25 04:40:00 -07:00
Camera Software Integration
b3d7948f33 Merge "msm: camera: reqmgr: Correct the logic of sync_link_sof_skip determination" into camera-kernel.lnx.7.0 2023-08-25 04:39:30 -07:00
Camera Software Integration
0d46010408 Merge "msm: camera: isp: Update acquired HW id for SFE2" into camera-kernel.lnx.7.0 2023-08-25 04:38:48 -07:00
Karthik Anantha Ram
5d40c5a2ef msm: camera: isp: Apply MUP at streamon correctly
With MUP update moved to per request structure, at streamon
when we issue the MUP using AHB we end up using an incorrect
MUP value.

CRs-Fixed: 3584759
Change-Id: I75d1c81c8f74731cc17a45d0363979bd8cd2d77b
Signed-off-by: Karthik Anantha Ram <quic_kartanan@quicinc.com>
(cherry picked from commit 015f2d278a93012bc98a3f22a2e25a5cb8f5a851)
2023-08-23 02:45:49 -07:00
mingpan
47456e549f msm: camera: reqmgr: Correct the logic of sync_link_sof_skip determination
When SOF timestmp of sync link is later than link, the value of
link->sof_timestamp - sync_link->sof_timestamp would be negative,
but sync_frame_duration is always positive. In this situation, the
value of sync_link_sof_skip would be incorrectly set to true.

CRs-Fixed: 3576909
Change-Id: I9bf26d217e0e9c317ca27d592cec148f075681bc
Signed-off-by: mingpan <quic_mingpan@quicinc.com>
(cherry picked from commit 85dcf379b53e89452cddbce67ff9fb62e895ea38)
2023-08-23 02:41:03 -07:00
Depeng Shao
6aa27c964f msm: camera: isp: Update acquired HW id for SFE2
This change adds sfe hw id 2 as valid hw id, then
sfe 2 info can be returned to userspace correctly.

CRs-Fixed: 3587713
Change-Id: I01825040837be4e1df204d7fe1c27887af3900e5
Signed-off-by: Depeng Shao <quic_depengs@quicinc.com>
(cherry picked from commit 9668c0f7a7963d6a6a43a6bb2352aa5b76201a83)
2023-08-23 02:40:11 -07:00
Karthik Anantha Ram
51846a0b77 msm: camera: isp: Fix reset sequence for dual case
There is no need to explicitly reset the slave CSID,
issuing a reset to master (both HW & SW) will be propagated
to the slave CSID. This avoids the handling of additional
reset_ack irq from slave, and any associated handling.

CRs-Fixed: 3580847
Change-Id: I9f787619c8322b7c3f96430762f4197af19e51fd
Signed-off-by: Karthik Anantha Ram <quic_kartanan@quicinc.com>
(cherry picked from commit 7356076769c8f381f6980f26e7a12f06a66af268)
2023-08-23 02:38:57 -07:00
Savita Patted
59049792d1 Snap for drop 08/14/2023 mainline 1038 LA.VENDOR.14.3.0.AU343
camera-kernel:
07558fb Merge 'msm: camera: memmgr: Add provision for heap selection' into camera-kernel.lnx.dev.

Change-Id: I270a1147b59d2f4cbc84230200eada137a11cbcd
Signed-off-by: Savita Patted <quic_spatted@quicinc.com>
2023-08-14 13:33:06 -07:00
Karthik Anantha Ram
594b59a2df msm: camera: memmgr: Add provision for heap selection
Currently, userland can only choose whether to allocate memory as
cached/uncached if it's a protected buffer, ubwc_p buffer, etc.
This change provides some more granularity in terms of heap selection.
One could now force an allocation from the system heap or
try a dedicated heap. The change also provides heap capability info
to userland as part of the query caps call.

CRs-Fixed: 3584481
Change-Id: Id4c92fd64d975f761e7dd4cecca8453dd09b039f
Signed-off-by: Karthik Anantha Ram <quic_kartanan@quicinc.com>
2023-08-14 13:33:05 -07:00
Haritha Chintalapati
1dd093a770 Snap for drop 08/10/2023 mainline 1037 LA.VENDOR.14.3.0.AU343
camera-kernel:
abdf5f94 Merge 'msm: camera: utils: Add address validation for io operation' into camera-kernel.lnx.dev
67648784 Merge 'msm: camera: sensor: Remove delay in camera sensor driver' into camera-kernel.lnx.dev
dbd5b124 Merge 'msm: camera: isp: Update SOF timestamps in top-half' into camera-kernel.lnx.dev.

Change-Id: I3b44b89cd979cb1e9bf10aaca138fc48aa7e3cd5
Signed-off-by: hchintal <quic_hchintal@quicinc.com>
2023-08-10 17:13:36 -07:00
Li Sha Lim
11bda3b669 msm: camera: isp: Update SOF timestamps in top-half
Currently, SOF timestamps are collected in bottom-half
routines. This may lead to a problem if bottom-half
execution is delayed, as it will then print frame N+1's
SOF timestamp instead of frame N; this will lead to two
duplicate SOF timestamps.

To fix this, SOF timestamps are read in top-half.

Some refactoring is done to enable SOF timestamps
to be read from vfe top half routine, as SOF timestamp
register values belong to CSID register space.

CRs-Fixed: 3485788
Change-Id: Ie13cf97072ab3f0688b835a4973e2ff27969e7ad
Signed-off-by: Li Sha Lim <quic_lishlim@quicinc.com>
2023-08-10 17:13:34 -07:00
Stark Lin
56429494cb msm: camera: utils: Add address validation for io operation
Kernel panic might be caused by improper register offset which
is not memory aligned during write or read operation, this change
adds a validation for the offset to avoid accessing invalid address.

CRs-Fixed: 3542219
Change-Id: I8761c8d416890bd4571be8a64118036c0173d303
Signed-off-by: Stark Lin <quic_starlin@quicinc.com>
2023-08-10 17:13:32 -07:00
Ridhi Mukesh shah
277c1f983b msm: camera: sensor: Remove delay in camera sensor driver
Removed the 20ms delay in the camera sensor driver during sensor probe.

Change-Id: I9a51c3d0b15d6c77196d00b9bfbf6a8dc76d63be
CRs-Fixed: 3244380
Signed-off-by: ridhshah <quic_ridhshah@quicinc.com>
2023-08-10 17:13:26 -07:00
Stark Lin
8ac893d982 msm: camera: isp: Fix some kw issues
This change fixes kw issues such as possible memory leak
and value is never used after assignment.

CRs-Fixed: 3574742
Change-Id: I757e055dbeeb308e4c115727774f183f8aae41be
Signed-off-by: Stark Lin <quic_starlin@quicinc.com>
2023-08-10 17:13:21 -07:00
Yash Upadhyay
42466f8068 msm: camera: isp: Number of valid vc dt check
Added num_valid_vc_dt check before first cid get call.

CRs-Fixed: 3248380
Change-Id: I02605adead5e2fd98db952e7c41ea2d56af38591
Signed-off-by: Yash Upadhyay <quic_yupadhya@quicinc.com>
2023-08-10 17:13:21 -07:00
Chandan Jha
f1cb553de2 msm: camera: tfe: Add support to Recover missed SOF timestamp
In case SOF interrupt is not received by the camera driver, we can
recover the missing SOF timestamp for the frame at epoch using the
previous and current SOF timestamp from CSID.

CRs-Fixed: 3232845
Change-Id: Id41860e125c26f2175c5180713c9b3c41741491b
Signed-off-by: Chandan Kumar Jha <quic_cjha@quicinc.com>
Signed-off-by: Pranav Sanwal <quic_psanwal@quicinc.com>
2023-08-10 17:13:21 -07:00
Alok Chauhan
b3c95f32d6 msm: camera: tfe: Print HBI and VBI info
Add format measure info to print HBI and VBI from csid.

CRs-Fixed: 3235284
Change-Id: I55148143624c492d2e220cf2e34012ba03f80630
Signed-off-by: Alok Chauhan <quic_alokc@quicinc.com>
2023-08-10 17:13:21 -07:00
Ayush Kumar
c64744b09d msm: camera: isp: Update clock value during init based on blob
Take the clock blob value into consideration during tfe init phase.
Set default clock in absence of clock blob from UMD.

CRs-Fixed: 3247771
Change-Id: I6d5b17b69066fa42293bcb8192c833cb57be0206
Signed-off-by: Ayush Kumar <quic_ayushkr@quicinc.com>
2023-08-10 17:13:21 -07:00
Alok Chauhan
1b002763fa msm: camera: isp: Add multiple MIDs support for per port
Add multiple MIDs support for TFE. This will help to parse
request dump during PF issue.

CRs-Fixed: 3206699
Change-Id: I0f6f82a1c217fde9a4f5628913bf8f5b43e4c2ee
Signed-off-by: Alok Chauhan <quic_alokc@quicinc.com>
2023-08-10 17:13:21 -07:00
Alok Chauhan
4ffc32da32 msm: camera: isp: Correct packer format for RS stats
Correct the packet format for RS stats configuration
during acquire time.

CRs-Fixed: 3206699
Change-Id: Ibcc615416603d427da0c41e8a2c2d519664367c8
Signed-off-by: Alok Chauhan <quic_alokc@quicinc.com>
2023-08-10 17:13:21 -07:00
Alok Chauhan
741818ee75 msm: camera: tfe: Take ceiling value while calculating width for wm
Take ceiling value while calculating width for PD10 format.

CRs-Fixed: 3201748
Change-Id: Ib2b722a5e7637b9eb247fba14b512f5338a79836
Signed-off-by: Alok Chauhan <quic_alokc@quicinc.com>
2023-08-10 17:13:21 -07:00
Wasim Khan
aaf897c89b Merge "Snap for drop 08/03/2023 mainline 1033 LA.VENDOR.14.3.0.AU330" into camera-kernel.lnx.7.0 2023-08-10 17:06:53 -07:00
Wasim Khan
43f3a20a94 Merge "msm: camera: common: Enable secure camera on Bazel build" into camera-kernel.lnx.7.0 2023-08-10 17:06:52 -07:00
Wasim Khan
c47495677b Merge "msm: camera: common: enabling DDK bazel build for camera" into camera-kernel.lnx.7.0 2023-08-10 17:06:49 -07:00
Wasim Khan
cc411dc671 Merge "msm: camera: common: changes to handle err in bazel build" into camera-kernel.lnx.7.0 2023-08-10 17:06:48 -07:00
Wasim Khan
ba313f4ee7 Merge "msm: camera: common: removing spectra custom config" into camera-kernel.lnx.7.0 2023-08-10 17:06:46 -07:00
Abhijit Trivedi
2a9dc04e61 Merge "Snap for drop 07/18/2023 mainline 1022 LA.VENDOR.14.3.0.AU306" into camera-kernel.lnx.7.0 2023-08-09 15:03:02 -07:00
Abhijit Trivedi
00d121a3ad Merge "msm: camera: csiphy: Add support for SM8750" into camera-kernel.lnx.7.0 2023-08-09 15:02:47 -07:00
Haritha Chintalapati
48b58adc04 Snap for drop 08/03/2023 mainline 1033 LA.VENDOR.14.3.0.AU330
camera-kernel:
f5a5caa6 msm: camera: common: Enable secure camera on Bazel build
6a3a6fe3 msm: camera: common: enabling DDK bazel build for camera
31642616 msm: camera: common: changes to handle err in bazel build
d001b07f msm: camera: common: removing spectra custom config.

Change-Id: I7a683f12cd546d6576f8e6ab77dc761f1d816c8b
Signed-off-by: hchintal <quic_hchintal@quicinc.com>
2023-08-03 16:50:05 -07:00
Vijay Kumar Tumati
aae436e4a1 msm: camera: common: Enable secure camera on Bazel build
Add the required Kconfig option for secure camera to work
on the targets with Domain ID support.

CRs-Fixed: 3535645
Change-Id: I74d3fc6b2b6f1d4d5fdf9d8f2d32f369d2f0467b
Signed-off-by: Vijay Kumar Tumati <quic_vtumati@quicinc.com>
2023-08-03 16:50:04 -07:00
Soumen Ghosh
8d62831c1b msm: camera: common: enabling DDK bazel build for camera
This change will help to enable DDK bazel build frameworks.

CRs-Fixed: 3535645
Change-Id: I2ac421b0b25474d20d856e1508d0f85a07396159
Signed-off-by: Soumen Ghosh <quic_soumeng@quicinc.com>
2023-08-03 16:50:02 -07:00
Soumen Ghosh
24a496388f msm: camera: common: changes to handle err in bazel build
Currently, the 'mm/slab.h' header is used to access a private kernel
structure. With Bazel, private headers are not available.
Refactor the code to avoid the use of the private header.

CRs-Fixed: 3535645
Change-Id: I3b442f0a7b2b70fbf638d3f505c47de88b14c5e6
Signed-off-by: Soumen Ghosh <quic_soumeng@quicinc.com>
2023-08-03 16:50:00 -07:00
Soumen Ghosh
9e0b27fa09 msm: camera: common: removing spectra custom config
Removing CONFIG_SPECTRA_CUSTOM config. Which is not
required for mainline build.

CRs-Fixed: 3535645
Change-Id: I6952370f223ac628eef8e35fe3992e81e48e9fdd
Signed-off-by: Soumen Ghosh <quic_soumeng@quicinc.com>
2023-08-03 16:49:59 -07:00
Camera Software Integration
9c0b4e1ae6 Merge "Snap for drop 07/28/2023 mainline 1029 LA.VENDOR.14.3.0.AU330" into camera-kernel.lnx.7.0 2023-08-02 16:40:37 -07:00
Camera Software Integration
1361bffa3d Merge "msm: camera: icp: Add support for fw pas id" into camera-kernel.lnx.7.0 2023-08-02 16:40:36 -07:00
Camera Software Integration
926e348031 Merge "msm: camera: tfe: Read last consumed address in top half" into camera-kernel.lnx.7.0 2023-08-02 16:40:35 -07:00
Camera Software Integration
07c2e923bd Merge "msm: camera: isp: removing dead code" into camera-kernel.lnx.7.0 2023-08-02 16:40:34 -07:00