提交图

560 次代码提交

作者 SHA1 备注 提交日期
Camera Software Integration
b4881d5569 Merge "msm: camera: ife: Change halt type" into camera-kernel.lnx.4.0 2020-02-26 13:13:55 -08:00
Camera Software Integration
3d0a403321 Merge "msm: camera: ife: Change data type for timeout" into camera-kernel.lnx.4.0 2020-02-24 13:20:48 -08:00
Camera Software Integration
43297e2c0e Merge "msm: camera: isp: Avoid dereference for unavailable port in ife out" into camera-kernel.lnx.4.0 2020-02-24 13:20:41 -08:00
Camera Software Integration
28b071f1a6 Merge "msm: camera: smmu: Fix unbalanced mutex unlock in camera smmmu" into camera-kernel.lnx.4.0 2020-02-21 13:40:05 -08:00
Camera Software Integration
1a40a879c3 Merge "msm: camera: isp: Fix failure due to dereference of invalid ife device" into camera-kernel.lnx.4.0 2020-02-21 13:39:51 -08:00
Camera Software Integration
cffa3f9379 Merge "msm: camera: cci: Add device managed alloc to balance free in remove" into camera-kernel.lnx.4.0 2020-02-21 13:39:41 -08:00
Venkat Chinta
a16202752f msm: camera: ife: Assign half the height value for cbcr plane
This change adds a check for plane ID when updating write master
height value in per frame blob. Plane C must be programmed with
half the height.

CRs-Fixed: 2626999
Change-Id: I44b4d69d9d330342c444bbe435c6a54ad9f3bd6f
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2020-02-21 11:34:40 -08:00
Mukund Madhusudan Atre
c5539d1d13 msm: camera: smmu: Fix unbalanced mutex unlock in camera smmmu
When smmu get handle is called, mutex unlock is called on a lock
that was not acquired. Add mutex lock condition to balance it.
Also, re-organize the conditions for handle types to be mutually
exclusive.

CRs-Fixed: 2584631
Change-Id: I057b8812c8f76e157503eb5c76aa1de174563f3a
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-02-20 10:56:21 -08:00
Mukund Madhusudan Atre
0e57ffd0a0 msm: camera: isp: Avoid dereference for unavailable port in ife out
During deinit, we are dereferencing resource data even for unavailable
out resource. Avoid dereferencing NULL pointer during vfe deinit out
resource.

CRs-Fixed: 2584631
Change-Id: I8488ccf73f62c551fc9d6ce3d636b10d8b0c7b8c
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-02-20 09:31:17 -08:00
Venkat Chinta
32eade687a msm: camera: isp: Config hardware in work queue
Currently requests for offline IFE are applied from tasklet
context or from an ioctl thread within a critical section
protected by a spinlock. In both of these cases, preemtion is
disabled but CDM requires mutex locks during this operation.
Therefore a work queue is added in this change to handle
apply request for offline IFE.

CRs-Fixed: 2606911
Change-Id: Ie893a626bc274d026fb878f1f19830e990be6dc6
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2020-02-19 17:56:44 -08:00
Venkat Chinta
f1a54282cc msm: camera: ife: Improve logs
This change adds more information to existing acquire and
hfr update logs.

CRs-Fixed: 2606911
Change-Id: I1ff4e1cbdd52be6b5c434438772084c4fdb2e80e
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2020-02-19 17:55:27 -08:00
Venkat Chinta
cf19384de7 msm: camera: ife: Change halt type
This commit changes halt type when HVX streamer is
enabled as halting immediately will lead to HVX hang.

CRs-Fixed: 2620821
Change-Id: Iab28cb91018899acec1eb671a87aec05b872391e
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2020-02-19 15:59:36 -08:00
Venkat Chinta
dbdab7dbb0 msm: camera: ife: Change data type for timeout
This commit changes the data type used to capture
wait for completion timeout return value from
integer type to the more appropriate unsigned
long type.

CRs-Fixed: 2620807
Change-Id: Ifcf54bdee133df5277ce56f0ba85442d32046eac
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2020-02-19 15:58:34 -08:00
Mukund Madhusudan Atre
3abdf420b1 msm: camera: isp: Fix failure due to dereference of invalid ife device
During reset of vfe hw, we are referencing an ife device which might
not be available. Add condition to check ife device validity before
reset.

CRs-Fixed: 2584631
Change-Id: Ibf9e3e0a3696cf006977af60360a964748e8ef38
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-02-17 19:27:25 -08:00
Mukund Madhusudan Atre
afb504ab34 msm: camera: cdm: Fix component unbind failures in cdm hw
In cdm hw unbind, smmu handle is destroyed before handler is
unset. Also, mutex unlock is unbalanced during error case. Fix
invalid unset handler call and unbalanced mutex in component
unbind for hw cdm.

CRs-Fixed: 2584631
Change-Id: I8e117ce9623ba631d9457ef851b8f271591091b6
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-02-16 23:31:43 -08:00
Mukund Madhusudan Atre
4e5ffd3ce0 msm: camera: cci: Add device managed alloc to balance free in remove
The devm_kfree call in remove is unbalanced without a devm_kzalloc.
Add required kzalloc and free during probe to balance it.

CRs-Fixed: 2584631
Change-Id: I14164405e62036f7918b858d978afe454e4feb4a
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-02-16 23:16:11 -08:00
Camera Software Integration
90d0abfbfd Merge "msm: camera: ife: Look into next request if res not found" into camera-kernel.lnx.4.0 2020-02-14 13:34:02 -08:00
Camera Software Integration
3060a9b340 Merge "msm: camera: ife: Assign VC/DT values for CSID TPG" into camera-kernel.lnx.4.0 2020-02-14 13:33:56 -08:00
Camera Software Integration
5708908284 Merge "msm: camera: csiphy: Update phy sequence for bengal" into camera-kernel.lnx.4.0 2020-02-14 13:33:49 -08:00
Camera Software Integration
672190fe8d Merge "msm: camera: ife: Reduce CSID reset timeout" into camera-kernel.lnx.4.0 2020-02-13 15:11:17 -08:00
Pavan Kumar Chilamkurthi
a44cb8d722 msm: camera: ife: Look into next request if res not found
In cases where IRQ delays or overlap happens, the IRQ
we get for the resource may belong to the 2nd request
in the queue. If the IRQ resource is not found in top
request, look into the second request as well.

CRs-Fixed: 2600457
Change-Id: Ida2665a00169463e2f146de1cfa6be076d8c7d72
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2020-02-13 10:59:21 -08:00
Venkat Chinta
a753fd0f4d msm: camera: ife: Assign VC/DT values for CSID TPG
This change adds check for CSID TPG to assign VC/DT
values for CSID path.

CRs-Fixed: 2619894
Change-Id: I94b3661e45285cd83b572353a6bcd3f2b04d31c7
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2020-02-12 15:00:47 -08:00
Camera Software Integration
6c7de8467b Merge "msm: camera: isp: Add support for offline IFE" into camera-kernel.lnx.4.0 2020-02-12 14:10:59 -08:00
Tony Lijo Jose
37b7384396 msm: camera: csiphy: Update phy sequence for bengal
Toggle reset register  in common and reset programming sequence.

CRs-Fixed: 2615460
Change-Id: Iba17fa3b2014be0bc27236169cf8456a7f8ededd
Signed-off-by: Tony Lijo Jose <tjose@codeaurora.org>
2020-02-12 12:24:00 -08:00
Rishabh Jain
704dc07b7b msm: camera: ope: Clear comp events before each request
If there is a stale entry of any event in the CDM,
it will end the wait of same event in next request.
So, clearing the comp events before each request.

CRs-Fixed: 2611231
Change-Id: I252ee5edaea1cda34dc48343dd6bc865b490e977
Signed-off-by: Rishabh Jain <risjai@codeaurora.org>
2020-02-12 12:06:50 -08:00
Venkat Chinta
7c25b49bef msm: camera: ife: Reduce CSID reset timeout
This change reduces CSID reset timeout from one second
to hundred milliseconds.

CRs-Fixed: 2619894
Change-Id: I1593b033356fc17c2fc35e962dd193a5537b23b7
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2020-02-12 11:33:31 -08:00
Camera Software Integration
6bc220f0a7 Merge "msm: camera: isp: Add support for PHY TPG" into camera-kernel.lnx.4.0 2020-02-11 13:37:48 -08:00
Camera Software Integration
3f87eedee9 Merge "msm: camera: isp: Obtain timestamp as part of frame header" into camera-kernel.lnx.4.0 2020-02-11 13:37:37 -08:00
Camera Software Integration
b52a99ab63 Merge "msm: camera: isp: LDAR Dump ISP information" into camera-kernel.lnx.4.0 2020-02-11 13:37:26 -08:00
Camera Software Integration
fe0a027a67 Merge "msm: camera: csiphy: Add combo phy settings for csiphy v1.2.2.2" into camera-kernel.lnx.4.0 2020-02-11 13:37:16 -08:00
Venkat Chinta
8e79606ada msm: camera: isp: Add support for offline IFE
This change adds new IRQ state machine and updates the acquire
logic to enable offline IFE. This change also adds the fixes
necessary to enable bus read for various buffer formats and
append go command at the end of each packet for offline
context.

CRs-Fixed: 2513939
Change-Id: Ie068670ed11aa6713e8f0cb817e4b5d4c209e696
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2020-02-10 15:50:56 -08:00
Venkat Chinta
131b4115d5 msm: camera: isp: Add support for PHY TPG
This change adds support for PHY TPG version
102 hardware.

CRs-Fixed: 2608550
Change-Id: I92387b08e8a91bb0c6a77b5301ebc30c7cb6f252
Signed-off-by: Vishalsingh Hajeri <vhajeri@codeaurora.org>
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-02-10 15:17:44 -08:00
Karthik Anantha Ram
381bb12c68 msm: camera: isp: Obtain timestamp as part of frame header
In use-cases that involve custom HW retrieve the timestamp
for shutter from frame header as opposed to csid registers.

CRs-Fixed: 2524308
Change-Id: I5de789cf939546affbfe6d537d8090982f39189d
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-02-10 14:56:25 -08:00
Gaurav Jindal
e3f5738e43 msm: camera: isp: LDAR Dump ISP information
When user space detects an error or does not receive
response for a request, Lets do a reset(LDAR) is triggered.
Before LDAR, user space sends flush command to the
kernel space.
In order to debug the cause for this situation and to dump
the information, user space sends a dump command to
kernel space before sending flush.
As a part of this command, it passes the culprit request id
and the buffer into which the information can be dumped.
Kernel space traverses across the drivers and find the culprit hw
and dumps the relevant information in the buffer.
This data is written to a file for offline processing.
This commit dumps the IFE, CSID registers, LUT tables and context
information, cmd buffers, timestamps information for
submit, apply, RUP, epoch and buffdones of the last 20
requests.

CRs-Fixed: 2612116
Change-Id: If83db59458c1e5ad778f3fa90cbc730122491c54
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2020-02-10 14:39:46 -08:00
Camera Software Integration
2460a8e82a Merge "msm: camera: isp: Add support to obtain frame index" into camera-kernel.lnx.4.0 2020-02-10 11:47:28 -08:00
Camera Software Integration
4c9c8a271a Merge "msm: camera: isp: Update IRQ controller names" into camera-kernel.lnx.4.0 2020-02-10 11:47:15 -08:00
Camera Software Integration
23372b610f Merge "msm: camera: common: LDAR dump NRT devices information" into camera-kernel.lnx.4.0 2020-02-10 11:46:57 -08:00
Karthik Anantha Ram
5ddf0a5cfb msm: camera: isp: Add support to obtain frame index
This change captures the frame index as part of the IFE top
register space at every epoch event. The index is then notified
to userspace as part of shutter notification.

CRs-Fixed: 2524308
Change-Id: Iac510c452f9ceda86e9f7d69528f22f81e614974
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-02-08 00:15:28 -08:00
Camera Software Integration
0894c95dda Merge "msm: camera: isp: Get packet opcode from hw manager" into camera-kernel.lnx.4.0 2020-02-07 15:14:33 -08:00
Camera Software Integration
67f139bf4b Merge "msm: camera: fd: skip halt and reset for session start" into camera-kernel.lnx.4.0 2020-02-07 15:13:59 -08:00
Camera Software Integration
d5fa77dbdd Merge "msm: camera: isp: Register dump for first request id" into camera-kernel.lnx.4.0 2020-02-07 15:13:41 -08:00
Camera Software Integration
ba20c111ed Merge "msm: camera: common: Add component helper support in camera" into camera-kernel.lnx.4.0 2020-02-07 15:13:17 -08:00
Camera Software Integration
5a3fb45a2a Merge "msm: camera: sensor: Notify completion in error case" into camera-kernel.lnx.4.0 2020-02-07 15:13:06 -08:00
Camera Software Integration
182154ab1c Merge "msm: camera: isp: Add epd Blob support" into camera-kernel.lnx.4.0 2020-02-07 15:12:59 -08:00
Camera Software Integration
8564b8d28b Merge "msm: camera: cpas: Add support for camnoc based voting" into camera-kernel.lnx.4.0 2020-02-07 15:12:50 -08:00
Gaurav Jindal
dbc2111c4f msm: camera: common: LDAR dump NRT devices information
When user space detects an error or does not receive
response for a request, Lets do a reset(LDAR) is triggered.
Before LDAR, user space sends flush command to the
kernel space.
In order to debug the cause for this situation and to dump
the information, user space sends a dump command to the
kernel space before sending flush.
As a part of this command, it passes the culprit request id
and the buffer into which the information can be dumped.
Kernel space traverses across the drivers and find the culprit hw
and dumps the relevant information in the buffer.
This data is written to a file for offline processing.
This commit dumps the information for NRT devices; JPEG,
LRME, FD and ICP.
For LRME, FD, JPEG context information is dumped.
FOR ICP, fw image is dumped.

Change-Id: I123e9b8289521a40d88156ba9bd0003ad9602f01
CRs-Fixed: 2602180
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2020-02-06 16:02:16 -08:00
Ravikishore Pampana
4f1ba0f292 msm: camera: isp: Get packet opcode from hw manager
While processing the user space submitted isp packet,
isp context need to know the packet opcode.
Get the opcode from the hw manager than the direct accessing the
opcode from packet.
Ife umd sends different opcodes then tfe umd. Both ife and tfe kernel
packet opcodes are same. So hw manager can consume this differences.

CRs-Fixed: 2585713
Change-Id: I54813af233cd8bfa640f2688c1334510a5b85f1c
Signed-off-by: Ravikishore Pampana <rpampana@codeaurora.org>
2020-02-06 15:13:05 -08:00
Tejas Prajapati
9ea8b73194 msm: camera: fd: skip halt and reset for session start
Halt and reset can be applied only at probe time and flush
time to clean up the MSF interface.

CRs-Fixed: 2593760
Change-Id: I8a19a5a5f4a3b25ef5fe9c18a1e754529418c53c
Signed-off-by: Tejas Prajapati <tpraja@codeaurora.org>
2020-02-06 14:49:42 -08:00
Ravikishore Pampana
05378eff25 msm: camera: isp: Register dump for first request id
First request id not getting dump if early pcr is on.
If early pcr is on need to store the parsed register dump descriptor
for first request id which comes as init packet.

CRs-Fixed: 2595702
Change-Id: Icbf94d65b5c35cdf47044d770c7db7093001d506
Signed-off-by: Ravikishore Pampana <rpampana@codeaurora.org>
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-02-06 13:01:12 -08:00
Camera Software Integration
a04ed17b0e Merge "msm: camera: req_mgr: Update link activate/deactivate to avoid race" into camera-kernel.lnx.4.0 2020-02-06 11:35:53 -08:00