提交線圖

1102 次程式碼提交

作者 SHA1 備註 日期
Jigar Agrawal
97133af139 msm: camera: cdm: Add Change base for RT-CDM
Add change base for CSID and VFE for RT-CDM support

CRs-Fixed: 2770438
Change-Id: I919019cc8e487c37b7726fae2125e70951c24a05
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
2020-12-11 10:53:59 -08:00
Anand Ravi
52cd6c6646 msm: camera: isp: VFE TOP Refactor
Added new files for vfe top configuration and
IRQ handling.

CRs-Fixed: 2830502
Change-Id: I3e84bccc4901b3b55308f447e3d86236ee28d799
Signed-off-by: Vishalsingh Hajeri <vhajeri@codeaurora.org>
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
Signed-off-by: Anand Ravi <ananravi@codeaurora.org>
2020-12-11 10:50:28 -08:00
Karthik Anantha Ram
89484fac10 msm: camera: isp: sHDR & offline changes in CSID
This change adds irq handling for sHDR and support
for offline use-case in CSID. These changes are relevant
only for CSID V680.

CRs-Fixed: 2830502
Change-Id: I873c6d6abba33f4da84438495cc0b00463746779
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-12-11 10:16:00 -08:00
Gaurav Jindal
4b58880f6f msm: camera: isp: CSID Driver Refactoring
Due to major hw changes in latest CSID680 IP block, refactoring of
CSID kernel driver is required.
To support the hw speciific driver, version based files
are added. One common file to support the common functionality
and common utilities has also been added.

CRs-Fixed: 2830502
Change-Id: If1e2a0835ce285f968f154d2da5595e882ae6ccd
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2020-12-11 22:12:44 +05:30
Abhijit Trivedi
5418bcb5d6 FF: Upto snap463: 'quic/camera-kernel.lnx.4.0' into 5.0 12/10/20
* quic/camera-kernel.lnx.4.0:
  msm: camera: cpas: Add hw version checks for Yupik camera
  msm: camera: cpas: Add support for Yupik camnoc
  msm: camera: isp: Remove WARN_ON() from error case in buf done
  msm: camera: icp: Fetch the firmware name from soc info
  msm: camera: cdm: Improve error handling during cdm hang
  msm: camera: cci: Fix logic to update cci clk freq
  msm: camera: isp: Transition to HALT state prior to HW stop
  msm: camera: isp: Print the expected height & width
  msm: camera: ope: Check array size of input sync obj
  msm: camera: isp: Add null check for vfe out res data
  msm: camera: isp: Update err type when notifying to HW MGR
  msm: camera: ife: Handle vfe out array properly
  msm: camera: ope: free unused memory in ope acquire
  msm: camera: isp: reduce bufdone error logs
  msm: camera: ope: Avoid submitting NULL request to CDM
  msm: camera: isp: Choose appropriate WM for frame header
  msm: camera: reqmgr: check applied req id for sync mode
  msm: camera: common: Improve IFE and CRM Logging
  msm: camera: smmu: Add support to force all CACHED

Change-Id: I589164549bc930986c1f5bb968d15e3714f03870
Signed-off-by: Abhijit Trivedi <abhijitt@codeaurora.org>
2020-12-10 12:13:14 -08:00
Camera Software Integration
1bdec879e6 Merge "msm: camera: cpas: Add hw version checks for Yupik camera" into camera-kernel.lnx.4.0 2020-12-10 11:02:45 -08:00
Camera Software Integration
0a3df107d1 Merge "msm: camera: smmu: Add support to force all CACHED" into camera-kernel.lnx.4.0 2020-12-10 11:02:22 -08:00
Camera Software Integration
0626661ebd Merge "msm: camera: cpas: Add support for Yupik camnoc" into camera-kernel.lnx.4.0 2020-12-10 11:02:13 -08:00
Camera Software Integration
72136a95ef Merge "msm: camera: isp: Remove WARN_ON() from error case in buf done" into camera-kernel.lnx.4.0 2020-12-10 11:01:46 -08:00
Camera Software Integration
cfad27efa7 Merge "msm: camera: icp: Fetch the firmware name from soc info" into camera-kernel.lnx.4.0 2020-12-10 11:01:34 -08:00
Camera Software Integration
3224cf35c3 Merge "msm: camera: cdm: Improve error handling during cdm hang" into camera-kernel.lnx.4.0 2020-12-10 10:59:56 -08:00
Camera Software Integration
a1aae58315 Merge "msm: camera: ope: free unused memory in ope acquire" into camera-kernel.lnx.4.0 2020-12-10 10:59:47 -08:00
Camera Software Integration
14cf978c81 Merge "msm: camera: cci: Fix logic to update cci clk freq" into camera-kernel.lnx.4.0 2020-12-10 10:58:39 -08:00
Ayush Kumar
92dbea0ccb msm: camera: cpas: Add hw version checks for Yupik camera
This change add titan hw version checks in csid, vfe and icp
camera drivers for Yupik camera.

CRs-Fixed: 2825675
Change-Id: Ibb704efa5eae327fc7c376328ceafc45a8217f44
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2020-12-09 04:57:36 -08:00
Ayush Kumar
315ec1178d msm: camera: cpas: Add support for Yupik camnoc
Add register information. Initial QoS settings info to program
camera static settings for chipsets having camera V165_100.

CRs-Fixed: 2825675
Change-Id: I433cfbe50705f09b961770371a3d3f29ff5f348c
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2020-12-09 13:27:52 +05:30
Chandan Kumar Jha
ebe8cb5e87 msm: camera: isp: Remove WARN_ON() from error case in buf done
This change prevents excessive logging. WARN_ON() prints
call stack which cause excessive logging in tasklet.
Removes WARN_ON() in error case where buf done irq for
a request exceeds actual number of out port.

CRs-Fixed: 2828453
Change-Id: I020cc74b73841e9599c4d1570829c6b086e768ec
Signed-off-by: Chandan Kumar Jha <cjha@codeaurora.org>
2020-12-08 11:34:48 +05:30
Vikram Sharma
da8fdb3095 msm: camera: icp: Fetch the firmware name from soc info
Use the a5 firmware name from soc info instead of hard coding.

CRs-Fixed: 2825675
Change-Id: Ifb089857777ae4d48c1c7ab6f12259a711c46152
Signed-off-by: Vikram Sharma <vikramsa@codeaurora.org>
2020-12-07 19:48:57 -08:00
Camera Software Integration
9d4e62ea34 Merge "msm: camera: ife: Handle vfe out array properly" into camera-kernel.lnx.4.0 2020-12-07 16:50:30 -08:00
Haritha Chintalapati
9d99a4fc95 Merge "msm: camera: ope: Avoid submitting NULL request to CDM" into camera-kernel.lnx.4.0 2020-12-02 19:10:56 -08:00
Haritha Chintalapati
99dff46326 Merge "msm: camera: isp: reduce bufdone error logs" into camera-kernel.lnx.4.0 2020-12-02 19:10:41 -08:00
Haritha Chintalapati
20e88f8b07 Merge "msm: camera: isp: Transition to HALT state prior to HW stop" into camera-kernel.lnx.4.0 2020-12-02 19:10:29 -08:00
Haritha Chintalapati
4a9c7c3e61 Merge "msm: camera: isp: Add null check for vfe out res data" into camera-kernel.lnx.4.0 2020-12-02 19:10:14 -08:00
Haritha Chintalapati
f0d94805f1 Merge "msm: camera: ope: Check array size of input sync obj" into camera-kernel.lnx.4.0 2020-12-02 19:10:00 -08:00
Haritha Chintalapati
974ca5d6f1 Merge "msm: camera: isp: Choose appropriate WM for frame header" into camera-kernel.lnx.4.0 2020-12-02 19:09:49 -08:00
Haritha Chintalapati
c1d9e46023 Merge "msm: camera: isp: Print the expected height & width" into camera-kernel.lnx.4.0 2020-12-02 19:09:36 -08:00
Haritha Chintalapati
d7cdc013ea Merge "msm: camera: isp: Update err type when notifying to HW MGR" into camera-kernel.lnx.4.0 2020-12-02 19:09:22 -08:00
Haritha Chintalapati
2d6e45797c Merge "msm: camera: reqmgr: check applied req id for sync mode" into camera-kernel.lnx.4.0 2020-12-02 19:09:10 -08:00
Haritha Chintalapati
56434293e9 Merge "msm: camera: common: Improve IFE and CRM Logging" into camera-kernel.lnx.4.0 2020-12-02 19:08:56 -08:00
Alok Chauhan
63bca8c33d msm: camera: cdm: Improve error handling during cdm hang
Reduce logging as part of error handling to avoid
flooding kernel log with excessive log. Apart from
that send feedback to client irrespective of cdm
reset status.

CRs-Fixed: 2826285
Change-Id: I9b0d8c6f64ced4972bb20e26774508573c815e4f
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
2020-12-02 10:38:53 +05:30
Anil Kumar Kanakanti
d87d172bde msm: camera: cci: Fix logic to update cci clk freq
When multiple frequency slaves running on a same I2C bus,
then there is a chance of overriding I2C bus frequency
even if another I2C operation is running. This could lead
to CCI timeout at driver level. Updated synchronization logic,
to properly update I2C clock frequency, only when no other
I2C operation running.

CRs-Fixed: 2815310
Change-Id: Ia341d7cda118497bf1acea8ea59f7f03124f31c3
Signed-off-by: Anil Kumar Kanakanti <akanakan@codeaurora.org>
2020-12-01 17:55:35 +05:30
Karthik Anantha Ram
b3f31ae726 msm: camera: isp: Transition to HALT state prior to HW stop
In case of any error IRQs encountered during stop, there is
no need to notify them to UMD since the entire pipeline
would be reset prior to next session start. With this change
we transition to HALT state and then issue stop.

CRs-Fixed: 2825121
Change-Id: I9535439d1a29e3b6f8da968b60e5b2b5bc32c1bf
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-11-30 18:27:00 -08:00
Karthik Anantha Ram
b3b1177fdf msm: camera: isp: Print the expected height & width
In case of pix/line count error, print the configured
pixels and lines directly from the format measure config
register as opposed to the data from the blob.

CRs-Fixed: 2825795
Change-Id: I8cdfb5afbd8cf573abeb7d4e3522d24fa37d8201
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-11-30 18:26:21 -08:00
Shravya Samala
c3c2045115 msm: camera: ope: Check array size of input sync obj
Incase of input buffer, check array size of input sync obj before assigning
fence.

CRs-Fixed: 2821583
Change-Id: I5cd7968cfbe0be86a8967565616bf6eb1cf7fcf7
Signed-off-by: Shravya Samala <shravyas@codeaurora.org>
2020-11-30 00:02:02 -08:00
Ayush Kumar
a73a482f76 msm: camera: isp: Add null check for vfe out res data
Fixes the null pointer dereference in the get Constraint error
function.

CRs-Fixed: 2825045
Change-Id: I72d8e51257fcfeca8386e626cf04db448bf3b483
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2020-11-30 00:01:37 -08:00
Karthik Anantha Ram
b8fa562370 msm: camera: isp: Update err type when notifying to HW MGR
Currently violation in FULL IFE on IPP/PPP path is treated
as overflow in HW_MGR. Update the err type correctly.

CRs-Fixed: 2815428
Change-Id: I2bbcdca03afc5be48281c39c50ecb32342ad7fbe
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-11-29 23:59:07 -08:00
Ravikishore Pampana
f9b9771412 msm: camera: ife: Handle vfe out array properly
Bus vfe out array is getting accessed beyond allocated space.
Check the index with max supported number vfe out values before
accessing the vfe out array. Use the proper index to access
the vfe out array.

CRs-Fixed: 2819234
Change-Id: I21865cb7025cc88f6b6015576eadd81eb3819eab
Signed-off-by: Ravikishore Pampana <rpampana@codeaurora.org>
2020-11-27 12:48:18 +05:30
Alok Chauhan
5a24b2b912 msm: camera: ope: free unused memory in ope acquire
OPE driver allocate memory dynamically to store cdm
acquire and bw data in acquire time and don't use later.
These memories can be freed before returning from acquire.

CRs-Fixed: 2827058
Change-Id: Ibf87282862f2ae4655da3c69016bedb7f96bca1c
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
2020-11-27 12:21:44 +05:30
Ravikishore Pampana
1f9cc4f48c msm: camera: isp: reduce bufdone error logs
If buf done error come for same applied request id then log
only once. Change the bufdone deferred logs to debug logs.

CRs-Fixed: 2824276
Change-Id: I870708bfb0c4f0ad0a1fade3a7e334551d055c73
Signed-off-by: Ravikishore Pampana <rpampana@codeaurora.org>
2020-11-25 23:14:20 +05:30
Alok Chauhan
e874b94c3a msm: camera: ope: Avoid submitting NULL request to CDM
In corner case, there is a chance that userspace can submit
request while flush is ongoing. In some cases submitted request
can get flushed and corresponding data structures  memory gets
freed.

Add a logic to check for pending request before submitting request
to cdm hw.

CRs-Fixed: 2815901
Change-Id: I74096201e204f204c4f15d14698b4e9af6435f55
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
2020-11-24 22:02:25 -08:00
Karthik Anantha Ram
b9e826686f msm: camera: isp: Choose appropriate WM for frame header
Frame header is not enabled on all WMs. Currently frame header
is piggy backed with the first WM for which buffer is configured.
It is possible that this WM does not support frame header.
This change tries with all WMs till it finds a WM that supports
frame header.

CRs-Fixed: 2823154
Change-Id: I300cb449cdeebc74300d100dfdd8dbe50bec9bce
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-11-24 15:55:14 -08:00
Abhijit Trivedi
4cfd29c06d FF: Upto snap456: 'quic/camera-kernel.lnx.4.0' into 5.0 11/24/20
* origin/camera-kernel.lnx.4.0:
  msm: camera: isp: Fix for NULL dereference for failure case of dual IFE
  msm: camera: sensor: Reset actuator flush requestId
  msm: camera: reqmgr: Rate limit workq delay warning
  msm: camera: icp: Check HW state prior to IRQ processing
  msm: camera: reqmgr: update timer even after skip frame
  msm: camera: reqmgr: Add checks before reporting the error
  msm: camera: csiphy: CSIPHY DPHY DeSkew Calibration
  msm: camera: utils: Rate limit error log in case of invalid handles
  msm: camera: isp: Handle buf_done without request in active_list
  msm: camera: cpas: Update jpeg qosgen settings
  msm: camera: cdm: Add more registers in cdm dump
  msm: camera: ife: Fix Constraint error print
  msm: camera: isp: Bubble re-apply with CDM callback detect
  msm: camera: isp: Add trigger id for EOF event
  msm: camera: isp: Add checks to ensure valid out resource info in dump
  msm: camera: cpas: Enhance cpas dump with more info
  msm: camera: reqmgr: Remove idx check when detecting congestion
  msm: camera: isp: Fixing KW errors
  msm: camera: custom: Add support for bubble handling
  msm: camera: isp: Handle QCFA bin eanbled case for MP limit fuse
  msm: camera: isp: Move the CSID irq logs to bottom half
  msm: camera: ife: Fix bus print dimension
  msm: camera: tfe: Enable the tfe diag debug feature
  msm: camera: isp: Wait for cdm submit incase of custom HW
  msm: camera: isp: Change dual IFE acquire sequence
  msm: camera: isp: Validate the ife bw blob data
  msm: camera: reqmgr: Fix timing issue while destroying the session
  msm: camera: isp: Fix the callback arguments in IFE
  msm: camera: reqmgr: Move skip frame log to rate limit for WQ congestion
  msm: camera: smmu: Avoid NULL dereference in cam_smmu_alloc_firmware
  msm: camera: isp: Skip qtimer shutter for invalid req_id

Change-Id: I422bafdb6349b08f911acb6bf3c9245cf7e03d3f
Signed-off-by: Abhijit Trivedi <abhijitt@codeaurora.org>
2020-11-24 15:49:37 -08:00
Haritha Chintalapati
ce18cf3937 Merge "msm: camera: cdm: Add more registers in cdm dump" into camera-kernel.lnx.4.0 2020-11-24 13:37:33 -08:00
Haritha Chintalapati
07152233db Merge "msm: camera: isp: Fix for NULL dereference for failure case of dual IFE" into camera-kernel.lnx.4.0 2020-11-23 16:55:01 -08:00
Haritha Chintalapati
9efbca83e5 Merge "msm: camera: sensor: Reset actuator flush requestId" into camera-kernel.lnx.4.0 2020-11-23 16:54:35 -08:00
Haritha Chintalapati
010a1e1426 Merge "msm: camera: reqmgr: Rate limit workq delay warning" into camera-kernel.lnx.4.0 2020-11-23 16:54:22 -08:00
Haritha Chintalapati
cf0971359d Merge "msm: camera: reqmgr: update timer even after skip frame" into camera-kernel.lnx.4.0 2020-11-23 16:54:03 -08:00
Haritha Chintalapati
9bc7143db7 Merge "msm: camera: icp: Check HW state prior to IRQ processing" into camera-kernel.lnx.4.0 2020-11-23 16:53:45 -08:00
Wyes Karny
c861a8d97a msm: camera: isp: Fix for NULL dereference for failure case of dual IFE
In the case of dual IFE acquire if left CSID reserve fails there is a
possibility of NULL pointer dereference.

CRs-Fixed: 2823225
Change-Id: Ib2bef582f69b245ee1d5b5b9ee8f5dacf8e2607a
Signed-off-by: Wyes Karny <wkarny@codeaurora.org>
2020-11-20 21:50:18 -08:00
Haritha Chintalapati
35c58f9297 Merge "msm: camera: reqmgr: Add checks before reporting the error" into camera-kernel.lnx.4.0 2020-11-20 14:15:03 -08:00
Sureshnaidu Laveti
6bbdcb3f6d msm: camera: sensor: Reset actuator flush requestId
When camera module shut down happens reset the
last flush request ID for the new session to
continue as fresh start.

CRs-Fixed: 2822543
Change-Id: Ic5b43d7acaeb7e7b6999c02cbb4654598469638b
Signed-off-by: Sureshnaidu Laveti <lsuresh@codeaurora.org>
2020-11-20 12:00:36 -08:00