Commit Graph

2409 Commits

Author SHA1 Message Date
Karthik Anantha Ram
dfaccd6b4f msm: camera: isp: Correct offsets in CSID v780 header
Correct frame drop pattern/period offsets in CSID 780 header.

CRs-Fixed: 3123590
Change-Id: I0f94c1e6301ae7b90ab9e4ae5fdd0dcf8c283da1
Signed-off-by: Karthik Anantha Ram <quic_kartanan@quicinc.com>
2022-02-10 15:36:15 -08:00
Savita Patted
d503e9996c Snap for drop 02/03/2022 mainline 714 LA.VENDOR.1.0.AU425
Change-Id: Iadd09b9e97bdb65334b0bb46db4c226110909b1e
Signed-off-by: Savita Patted <quic_spatted@quicinc.com>
2022-02-03 23:36:07 -08:00
Savita Patted
1a8bdb607d CAMX: Snap for drop 02/02/2022 mainline 713 LA.VENDOR.1.0.AU425
a5bbb41 Merge "msm: camera: icp: LDAR Dump ICP Extension" into camera-kernel.lnx.dev
8e42625 Merge "msm: camera: icp: protect timer stop with hw mutex" into camera-kernel.lnx.dev
e07d9ca Merge "msm: camera: isp: Keep LSB aligned for Plain16_10/12/14 RDI buffers" into camera-kernel.lnx.dev
dec525e Merge "msm: camera: isp: Minor fixes in logging errors in IFE top and bus" into camera-kernel.lnx.dev
31df154 Merge "msm: camera: ife: Fix debug statements for expanded memory" into camera-kernel.lnx.dev
bcbe113 Merge "msm: camera: core: Control expanded memory patching per caller" into camera-kernel.lnx.dev
bbf0924 Merge "msm: camera: jpeg: Fix jpeg output in kailua presil" into camera-kernel.lnx.dev
c771194 Merge "msm: camera: csiphy: Remove lane specific configuration" into camera-kernel.lnx.dev

Change-Id: I35e16fd457e82b56a152b28a25c882b646a31014
Signed-off-by: Savita Patted <quic_spatted@quicinc.com>
2022-02-03 23:06:21 -08:00
Karthik Jayakumar
28239ed1e6 msm: camera: core: Control expanded memory patching per caller
Force callers to say if they are using 36 bit address patching or not.

CRs-fixed: 3121782
Change-Id: I4dee25e3f73104a1be043fe18a295cd4f8447821
Signed-off-by: Karthik Jayakumar <quic_kjayakum@quicinc.com>
2022-02-03 23:06:09 -08:00
Anand Ravi
b0d73dc7ac msm: camera: isp: Minor fixes in logging errors in IFE top and bus
Print out WM information on CCIF violation.

CRs-Fixed: 3121755
Change-Id: I0fffd8cf4bc7af660f120ba1df8917cd95af64b4
Signed-off-by: Anand Ravi <quic_ananravi@quicinc.com>
2022-02-02 22:37:23 -08:00
Karthik Jayakumar
7f9260a75a msm: camera: ife: Fix debug statements for expanded memory
Corrects the variable debug print statements for expanded memory case
in IFE.

CRs-Fixed: 3120109
Change-Id: I08e2849db21459ebaecec68a7340d8d103562743
Signed-off-by: Karthik Jayakumar <quic_kjayakum@quicinc.com>
2022-02-02 22:37:12 -08:00
Suraj Dongre
56b320495d msm: camera: jpeg: Fix jpeg output in kailua presil
Changed code to fix wrong resource type causing blank output.

CRs-Fixed: 2932495
Change-Id: I7512b9784a6699d466e88e6f68dfc7144673bab1
Signed-off-by: Suraj Dongre <quic_sdongre@quicinc.com>
2022-02-02 22:37:00 -08:00
Pavan Kumar Chilamkurthi
5561a5d0ef msm: camera: isp: Keep LSB aligned for Plain16_10/12/14 RDI buffers
Due to hw limitation, if the required RDI buffer output is
Plain16_10/12/14, BUS cannot conver CSID unpacked MSB data
into LSB aligned while writing the buffers. So keep CSID out
as unpacked LSB data if the final RDI output buffer format
is Plain16_10/12/14. This will have limitation in using RDI
data going into LCR/PDAF.

CRs-Fixed: 3118104
Change-Id: I9193530ec549b4658a058ae71eed4f31653bd88e
Signed-off-by: Pavan Kumar Chilamkurthi <quic_pchilamk@quicinc.com>
2022-02-02 22:36:50 -08:00
Jigar Agrawal
97380c4614 msm: camera: csiphy: Remove lane specific configuration
Currently lane specific general register programming is structured
with lane index basis. This is not required as general register
needs to program without any condition. This change updates structure
of this programming register. Also, array size calculation is replace
with more intutive way rather to manually enter the size everytime.

CRs-Fixed: 3117726
Change-Id: I5e57f37bf2025b37f23c10b835fd31ddfe986cee
Signed-off-by: Jigarkumar Zala <quic_jzala@quicinc.com>
Signed-off-by: Jigar Agrawal <quic_jigar@quicinc.com>
2022-02-02 22:36:40 -08:00
Tejas Prajapati
6f8e74a1b9 msm: camera: icp: protect timer stop with hw mutex
To avoid concurrent access to the device timers while
stopping them, keep the stop call protected with hw
mutex.

CRs-Fixed: 3080397
Change-Id: If0a5226536e3a3c14738811965511225d1a96f08
Signed-off-by: Tejas Prajapati <quic_tpraja@quicinc.com>
2022-02-02 22:36:28 -08:00
Joshua Florez
5ce71f412e msm: camera: icp: LDAR Dump ICP Extension
Extension of Let's do a reset (LDAR) for ICP to include more info.

CRs-Fixed: 3105929
Change-Id: I5fee181d009a8d69e8d3e673a552b289f72fb4aa
Signed-off-by: Joshua Florez <quic_jflorez@quicinc.com>
2022-02-02 22:36:14 -08:00
Savita Patted
47bc8ee37d CAMX: Snap for drop 01/28/2022 mainline 710 LA.VENDOR.1.0.AU393
camera-kernel:
48c1c34 Merge "msm: camera: csiphy: Add lane enable register capability" into camera-kernel.lnx.dev
f354ed9 Merge "msm: camera: isp: Keep the data in MSB while unpacking at CSID" into camera-kernel.lnx.dev

Change-Id: If82b6a657c246dfc1872ef65acc17e939da4ec32
Signed-off-by: Savita Patted <quic_spatted@quicinc.com>
2022-02-01 11:36:28 -08:00
Pavan Kumar Chilamkurthi
e93d8d7197 msm: camera: isp: Keep the data in MSB while unpacking at CSID
BUS, SFE pipeline(xCFA), PDAF/RDI-LCR pipeline expects the
incoming valid data to be in MSB. So, if RDI data is unpacked
to PLAIN_16 at CSID out, keep the valid data in MSB.
For final out formats PLAIN16_10/12/14/16 formats, unpack
data at CSID and keep in MSB and use wm pack with LSB write,
as LCR/PDAF can be enabled with these final out formats and
expects data in MSB.

CRs-Fixed: 3118104
Change-Id: Idb64d809ea006192eb29bb9bb57c5c12a6e8b136
Signed-off-by: Pavan Kumar Chilamkurthi <quic_pchilamk@quicinc.com>
2022-01-28 19:06:19 -08:00
Jigar Agrawal
17dd74fd32 msm: camera: csiphy: Add lane enable register capability
Add and handle lane enable register offset programming independent
than common control register array.

CRs-Fixed: 3117726
Change-Id: I7a9cfe41cb425143bf2be6c48de47dfb5e117aae
Signed-off-by: Jigarkumar Zala <quic_jzala@quicinc.com>
Signed-off-by: Jigar Agrawal <quic_jigar@quicinc.com>
2022-01-28 19:06:08 -08:00
Savita Patted
de2a3b8ede Snap for drop 01/27/2022 mainline 709 LA.VENDOR.1.0.AU393
camera-kernel:
9d6b5a9 Merge "msm: camera: common: logging improvement" into camera-kernel.lnx.dev
b04e14d Merge "msm: camera: csiphy: Fix the version check for CP mask" into camera-kernel.lnx.dev

Change-Id: Ic1b5177f05b19aaaaceaad48e2ef2bae224106d2
Signed-off-by: Savita Patted <quic_spatted@quicinc.com>
2022-01-28 11:06:10 -08:00
Jigar Agrawal
e88df2b339 msm: camera: csiphy: Fix the version check for CP mask
To configure CP mask correct version check needs to be
used against CPAS hw version. Currently csiphy driver
is checking platform version to make the decision.
This change update this check with CPAS hw version check.

CRs-Fixed: 3048249
Change-Id: Id023f5cc0252b47c274dfed9d93e7f49a3d0ab49
Signed-off-by: Jigarkumar Zala <quic_jzala@quicinc.com>
Signed-off-by: Jigar Agrawal <quic_jigar@quicinc.com>
2022-01-27 19:36:23 -08:00
Wang Kan
df174ddd8a msm: camera: common: logging improvement
After flushed, KMD reports ERR including isp, actuator, sensor, flash.
However many CRs don't have fatal KMD error log, but participant is KMD.
Remove the non-fatal KMD error log.

CRs-Fixed: 3095401
Change-Id: I0e5e370c0c4d1daceb72d9eed8d0c45baad5179e
Signed-off-by: Wang Kan <quic_wkan@quicinc.com>
2022-01-27 19:36:09 -08:00
Savita Patted
e89f48aea2 Snap for drop 01/26/2022 mainline 708 LA.VENDOR.1.0.AU393
camera-kernel:
c8e56da Merge "msm: camera: cdm: Fix the CDM Reg dump" into camera-kernel.lnx.dev
e63fee2 Merge "msm: camera: isp: Add support for the new error codes" into camera-kernel.lnx.dev

Change-Id: I5a62e828fbaa686af2b2dd84f1ad879cf6562b5e
Signed-off-by: Savita Patted <quic_spatted@quicinc.com>
2022-01-27 12:06:10 -08:00
Jigar Agrawal
b9cc540346 msm: camera: cdm: Fix the CDM Reg dump
Fix the CDM register dump and the command buffer dump.

CRs-Fixed: 3115371
Change-Id: I8b047f365187362593038724b29b98f1f40e47df
Signed-off-by: Jigar Agrawal <quic_jigar@quicinc.com>
2022-01-26 23:06:23 -08:00
Jigar Agrawal
d6192c9112 msm: camera: isp: Add support for the new error codes
Add support for more error codes in the kernel code to
report more errors to user.

CRs-Fixed: 3112574
Change-Id: I6eef2bd73d5ff7cac9d0ed95682c76c4438cfa47
Signed-off-by: Jigar Agrawal <quic_jigar@quicinc.com>
2022-01-26 23:06:10 -08:00
Savita Patted
491c425ca8 Snap for drop 01/25/2022 mainline 707 LA.VENDOR.1.0.AU393
Change-Id: I729cd97481846ae15bb575690ed8de5339d60549
Signed-off-by: Savita Patted <quic_spatted@quicinc.com>
2022-01-25 18:36:10 -08:00
Savita Patted
ef8261b6b7 Snap for drop 01/21/2022 mainline 706 LA.VENDOR.1.0.AU393
camera-kernel:
07f5602 Merge "msm: camera: isp: Combine the exp info for EPCR case" into camera-kernel.lnx.dev
a01b7f3 Merge "msm: camera: icp: Add traces for icp" into camera-kernel.lnx.dev
397ab2a Merge "msm: camera: common: Add msm-mmrm dependency to camera-kernel" into camera-kernel.lnx.dev
d32bfd9 Merge "msm: camera: isp: Skip RDI0 resources acquire if already acquired" into camera-kernel.lnx.dev

Change-Id: I30750ba5a1b7a5d9d0e63281512c08e4d03d5534
Signed-off-by: Savita Patted <quic_spatted@quicinc.com>
2022-01-21 21:36:12 -08:00
Chandan Kumar Jha
5a05b7be08 msm: camera: isp: Skip RDI0 resources acquire if already acquired
We acquire RDI0 by default for SFE cases without RDI out ports.
We need to skip RDI0 resource acquire if RDI0 is already acquired
previously.

CRs-Fixed: 3092119
Change-Id: Icb62b07f03b1ac14560ca152e6fca479a4acb1a4
Signed-off-by: Chandan Kumar Jha <quic_cjha@quicinc.com>
2022-01-21 19:36:56 -08:00
Karthik Jayakumar
c115c89179 msm: camera: common: Add msm-mmrm dependency to camera-kernel
Updates board list of supported msm-mmrm boards to include kalama.

CRs-Fixed: 2980570
Change-Id: I182ef8b56b67c24d1ad9c4b23f475782f93e8aed
Signed-off-by: Karthik Jayakumar <quic_kjayakum@quicinc.com>
2022-01-21 19:36:45 -08:00
Pavan Kumar Chilamkurthi
5fafa34efe msm: camera: icp: Add traces for icp
Add acquire, buf_done traces for icp contexts.

CRs-Fixed: 3105126
Change-Id: Ic12640b703ae819915eb3df7dc69b3b39f4f10ac
Signed-off-by: Pavan Kumar Chilamkurthi <quic_pchilamk@quicinc.com>
2022-01-21 19:36:33 -08:00
Depeng Shao
91b28696d8 msm: camera: isp: Combine the exp info for EPCR case
Combine the num_exp for sHDR EPCR case, and we can
override the mode switch related parameters only
when the mup is enabled in new req.

CRs-Fixed: 3106141
Change-Id: I1bd0b38402962ca598f2e5c6bd528a0af2adc55f
Signed-off-by: Depeng Shao <quic_depengs@quicinc.com>
2022-01-21 19:36:13 -08:00
Savita Patted
c2d406911f Snap for drop 01/20/2022 mainline 705 LA.VENDOR.1.0.AU393
camera-kernel:
7179db5 Merge "msm: camera: isp: LDAR Dump ISP Extension" into camera-kernel.lnx.dev
d9e73d0 Merge "msm: camera: common: Fix few incorrect log" into camera-kernel.lnx.dev

Change-Id: I80b45841af50aea05a5bff678ab5537d598f166f
Signed-off-by: Savita Patted <quic_spatted@quicinc.com>
2022-01-20 23:06:26 -08:00
Joshua Florez
d644749f16 msm: camera: isp: LDAR Dump ISP Extension
Extension of Lets do a reset (LDAR) to include more information
in dump with more dump output enhancements.

CRs-Fixed: 3068971
Change-Id: I6b61bcf546e32c096e45c511faf64514ff391e62
Signed-off-by: Joshua Florez <quic_jflorez@quicinc.com>
2022-01-20 21:06:58 -08:00
Depeng Shao
6e9ae02655 msm: camera: common: Fix few incorrect log
Fix few incorrect log and add ctx id for
irq handling log.

CRs-Fixed: 3101894
Change-Id: Ibd2783124ed6354a379b9804e6e6bc01f2ab6fb3
Signed-off-by: Depeng Shao <quic_depengs@quicinc.com>
2022-01-20 21:06:25 -08:00
Savita Patted
d272ddcb9a Snap for drop 01/19/2022 mainline 704 LA.VENDOR.1.0.AU393
camera-kernel:
180ce1c Merge "msm: camera: uapi: Add PF msg struct" into camera-kernel.lnx.dev
ea499a7 Merge "msm: camera: sensor: Add IR/XCFA/SHDR overlapped for TPG0" into camera-kernel.lnx.dev

Change-Id: I19f85d506fe1381b10c5f2ace905b268407a0558
Signed-off-by: Savita Patted <quic_spatted@quicinc.com>
2022-01-19 19:06:09 -08:00
sokchetra eung
a27ab6d632 msm: camera: uapi: Add PF msg struct
Add data struct for reporting v4l2 event on page
fault. Upon receiving the event, userspace is
expected to abort, and all kernel drivers are shut
down. when Titan power on the next session, CAMSS
will undergo async reset.

CRs-Fixed: 3109439
Change-Id: I518148baa2414fd072b874200a408589332f95ec
Signed-off-by: sokchetra eung <quic_eung@quicinc.com>
2022-01-19 16:06:50 -08:00
Rishab Garg
e79f7727a3 msm: camera: sensor: Add IR/XCFA/SHDR overlapped for TPG0
Kailua tpg has some extra register for ir/xcfa/shdr overlapped.
These register data support is added as part of this change.

CRs-Fixed: 3086082
Change-Id: If044b336a87de931f6d512c52895e65c85d10863
Signed-off-by: Rishab Garg <quic_rishabg@quicinc.com>
2022-01-19 16:06:29 -08:00
Savita Patted
c35584d0b7 Snap for drop 01/14/2022 mainline 702 LA.VENDOR.1.0.AU393
camera-kernel:
00bca18 Merge "msm: camera: sensor: Add 2PD support for TPG0" into camera-kernel.lnx.dev
9051b15 Merge remote-tracking branch 'origin/camera-kernel.lnx.6.0' into camera-kernel.lnx.dev

Change-Id: I29a42cf0ed36bf0abb222c2e08ee98b9667659e6
Signed-off-by: Savita Patted <quic_spatted@quicinc.com>
2022-01-19 13:31:20 -08:00
Rishab Garg
31a3e23afc msm: camera: sensor: Add 2PD support for TPG0
Add interleaving format to support 2PD for tpg0.

CRs-Fixed: 3100297
Change-Id: Ic59c4cec0990faa3d70f45aa34baebaa33e08b2b
Signed-off-by: Rishab Garg <quic_rishabg@quicinc.com>
2022-01-19 13:31:20 -08:00
Gaurav Jindal
0bd0f23d03 msm: camera: isp: Add Support for XCFA RDI requirements
For SFE 780, Input to SFE from CSID for single xcfa use cases
is RDI0.
This commit changes the acquire logic to acquire RDI0
in case of SFE context for single ISP/SFE use cases and IPP
for dual ife cases.

CRs-Fixed: 3092119
Change-Id: I7e7ba0438435c6fe7a8b0d22f7c08b7ce4da1819
Signed-off-by: Gaurav Jindal <quic_gjindal@quicinc.com>
2022-01-19 13:31:19 -08:00
Savita Patted
910867ce20 Snap for drop 01/07/2022 kernel-dev FF to camera-kernel 6.0.
Change-Id: I493ccfb878e30c25d87feff28c5f407fd4ffe17a
Signed-off-by: Savita Patted <quic_spatted@quicinc.com>
2022-01-19 13:30:56 -08:00
Camera Software Integration
02cd33019c Merge "msm: camera: jpeg: Add mechanism to verify IRQ lines" into camera-kernel.lnx.6.0 2022-01-06 15:58:42 -08:00
Camera Software Integration
6a5f8af8d3 Merge "msm: camera: icp: Add mechanism to verify IRQ lines" into camera-kernel.lnx.6.0 2022-01-06 15:58:31 -08:00
Haritha Chintalapati
f1e5f33d90 Merge "msm: camera: isp: Moving req to active list first" into camera-kernel.lnx.6.0 2022-01-05 18:05:01 -08:00
Anand Ravi
4355ad8cb4 msm: camera: jpeg: Add mechanism to verify IRQ lines
IRQ line verification can now be triggerred from JPEG HW manager by
writing to a debugfs file as follows:
    echo 1 > /d/camera/jpeg/test_irq_line

IRQ line verification can also be done at probe if
CONFIG_CAM_TEST_IRQ_LINE_AT_PROBE is set to true during compilation.
Both debugfs and probe-time verifications are only active if
CONFIG_CAM_TEST_IRQ_LINE is set to true during compilation.

CRs-Fixed: 3071027
Change-Id: Ib24022a12e3aa3ac529c7bc925fd4df1f2a96310
Signed-off-by: Anand Ravi <quic_ananravi@quicinc.com>
2022-01-05 11:50:31 -08:00
Anand Ravi
af9072bcc6 msm: camera: icp: Add mechanism to verify IRQ lines
IRQ line verification can now be triggerred from ICP HW manager by
writing to a debugfs file as follows:
    echo 1 > /d/camera/icp/test_irq_line

IRQ line verification can also be done at probe if
CONFIG_CAM_TEST_IRQ_LINE_AT_PROBE is set to true during compilation.
Both debugfs and probe-time verifications are only active if
CONFIG_CAM_TEST_IRQ_LINE is set to true during compilation.

CRs-Fixed: 3071027
Change-Id: I386548d1ed817674be8322c8be792e2c57f9d166
Signed-off-by: Anand Ravi <quic_ananravi@quicinc.com>
2022-01-05 11:50:31 -08:00
Haritha Chintalapati
226acd5b9f Merge "msm: camera: cdm: Add support for testing irq line" into camera-kernel.lnx.6.0 2022-01-04 19:03:53 -08:00
Haritha Chintalapati
80985916ca Merge "msm: camera: cpas: Add support for verifying test irq" into camera-kernel.lnx.6.0 2022-01-04 19:03:23 -08:00
Haritha Chintalapati
23338dde1c Merge "msm: camera: isp: Fix resource assignment during ppp recovery" into camera-kernel.lnx.6.0 2022-01-04 19:03:12 -08:00
Haritha Chintalapati
5a3347fb3f Merge "msm: camera: isp: Add logs to print hw versions during init" into camera-kernel.lnx.6.0 2022-01-04 19:03:00 -08:00
Haritha Chintalapati
9e35b4588c Merge "msm: camera: isp: Add mechanism to verify IRQ lines" into camera-kernel.lnx.6.0 2022-01-04 19:02:42 -08:00
Haritha Chintalapati
124c3cf6ed Merge "msm: camera: common: create a common root folder for debugfs" into camera-kernel.lnx.6.0 2022-01-04 19:02:17 -08:00
Haritha Chintalapati
84b5e0f4cb Merge "msm: camera: jpeg: Add v780 header for jpeg enc and dma" into camera-kernel.lnx.6.0 2022-01-04 19:02:05 -08:00
Haritha Chintalapati
f0de92c0aa Merge "msm: camera: isp: Handle PD and RDI resource if PIX port is not present" into camera-kernel.lnx.6.0 2022-01-04 19:01:53 -08:00
Depeng Shao
30c59c7aa6 msm: camera: isp: Moving req to active list first
Sometimes, all the buf dones of bubble req have been
received, but they are deferred buf done. If we handle
the deferred buf done before moving the req to active
list, the req will be moved to pending list first during
processing the buf done of bubble req, then moved to
active req list in the processing of epoch_in_applied.
This change moves the bubble req to active list first,
then handle the deferred buffer done.

CRs-Fixed: 3096361
Change-Id: I1e9b1ba5a46509b1c08ec92bbca0c2d7fbde679c
Signed-off-by: Depeng Shao <quic_depengs@quicinc.com>
2021-12-30 21:20:26 -08:00