Commit Graph

430 Commits

Author SHA1 Message Date
Camera Software Integration
5859f31453 Merge "msm: camera: common: Fix types for comparison function" into camera-kernel.lnx.4.0 2020-03-13 18:08:06 -07:00
Karthik Jayakumar
75740a1ced msm: camera: common: Fix types for comparison function
Creates a function to match expectant types for platform device
comparisons during component registration.

CRs-Fixed: 2584631
Change-Id: Ib07160b8d8f1a370ba535ffdbbc6adbe391c68d5
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2020-03-10 12:57:20 -07:00
Venkat Chinta
5619d4e93e msm: camera: ife: Unmask top level bus write IRQ bit
During VFE reset we mask all bits apart from reset done. Since
the top level bus write IRQ bit is common to all output ports
it is set during the initialize hardware sequence. However since
initialize hardware is not invoked in start only case that follows
flush, we must set it again.

CRs-Fixed: 2590331
Change-Id: I73f09e552779bd65f472178c1025594be03025fb
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2020-03-05 11:10:07 -08:00
Haritha Chintalapati
a018ba6cf1 Merge "msm: camera: ife: Assign half the height value for cbcr plane" into camera-kernel.lnx.4.0 2020-03-04 14:31:30 -08:00
Haritha Chintalapati
0f65d30e1d Merge "msm: camera: csid: Rename TPG vd/dt macros" into camera-kernel.lnx.4.0 2020-03-03 14:21:05 -08:00
Haritha Chintalapati
4243c023a9 Merge "msm: camera: ife: Add check for DSP enabled in acquire" into camera-kernel.lnx.4.0 2020-03-03 14:20:53 -08:00
Haritha Chintalapati
3d02c7f405 Merge "msm: camera: sensor: Update maximum supported camera id" into camera-kernel.lnx.4.0 2020-03-03 14:20:43 -08:00
Haritha Chintalapati
bcc4402eed Merge "msm: camera: sensor: Update I2C read/write size" into camera-kernel.lnx.4.0 2020-03-03 14:20:31 -08:00
Camera Software Integration
695e073072 Merge "msm: camera: common: Fix failures in v4l2 unregister during error" into camera-kernel.lnx.4.0 2020-03-02 15:05:39 -08:00
Camera Software Integration
3fb2481cb0 Merge "msm: camera: flash: Add qti flash support in camera" into camera-kernel.lnx.4.0 2020-03-02 15:05:29 -08:00
Camera Software Integration
4723bcdf25 Merge "msm: camera: ife: Save dual IFE flag" into camera-kernel.lnx.4.0 2020-03-02 15:05:06 -08:00
Karthik Jayakumar
a6a80b5c2b msm: camera: sensor: Update I2C read/write size
Update I2C read and write capability to 10kb.

CRs-Fixed: 2584631
Change-Id: Iffffb18ad79a5492df2ca0aa0f1411ae67cb92cc
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2020-02-28 17:06:52 -08:00
Mukund Madhusudan Atre
0a649b3063 msm: camera: common: Fix failures in v4l2 unregister during error
Missing video unregister was causing list delete corruption.
Also, there were double free errors in Sync and CRM driver. Fix
v4l2 issues by adding the missing unregister calls and changing
release callback to empty, because we are freeing it during
cleanup. Improve logging during bind/unbind to better reflect what
is happening.

CRs-Fixed: 2584631
Change-Id: Idc5db655d22df54e8bdb470d29896e10f6987796
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-02-28 16:02:56 -08:00
Karthik Jayakumar
3ba88cc32f msm: camera: sensor: Update maximum supported camera id
Updates maximum number of supported camera id to 9

CRs-Fixed: 2584631
Change-Id: I00a595d784b38030a7996a8da930ecdeaf05835c
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2020-02-28 16:00:52 -08:00
Venkat Chinta
c5086bcea3 msm: camera: csid: Rename TPG vd/dt macros
CSID TPG and PHY TPG require different values for VC/DT. This change
renames the macros to more distinct identifiers and assigns the
appropriate values based on input TPG type.

CRs-Fixed: 2632165
Change-Id: I136eb88a7cec338898cab8537cb080a0f26c2f77
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2020-02-28 15:29:10 -08:00
Venkat Chinta
4682501c82 msm: camera: ife: Add check for DSP enabled in acquire
This change adds a check if DSP is enabled to ensure lower
index IFE cores are acquired since only they support DSP
mode.

CRs-Fixed: 2632139
Change-Id: Ib1be26be9d5afd83f565ddf5adb989ef463d8b8d
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2020-02-28 14:46:48 -08:00
Venkat Chinta
88406b50a8 msm: camera: ife: Save dual IFE flag
This change saves the dual IFE flag during CAMIF acquire. This
line was misplaced during rebase of commit 8e79606ada ("msm:
camera: isp: Add support for offline IFE").

CRs-Fixed: 2630545
Change-Id: I321898aa6550b15240ca4308b1ceda1fbad14963
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2020-02-27 14:25:36 -08:00
Mukund Madhusudan Atre
ac6f8eeb6d msm: camera: flash: Add qti flash support in camera
Add support for qti flash along with updated max current DT
property. Remove support for enable/disable regulator as it
is no-op since a long time.

CRs-Fixed: 2584631
Change-Id: I3305e7b6e4d6ef34d90d38f5f25cfa5b8b817f8b
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-02-27 14:17:13 -08:00
Mukund Madhusudan Atre
85aae7fa2c msm: camera: fd: Add balanced dynamic allocation for free in init
The work data passed as payload to workq is statically allocated,
which has kfree call during destroy, this fails during component
unbind. Change allocation of work data to dynamic in fd hw manager.

CRs-Fixed: 2584631
Change-Id: I0cd2a152d39793ce620e9a9fc2950ee91cefe6bf
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-02-26 16:57:38 -08:00
Camera Software Integration
3a756cef36 Merge "msm: camera: isp: Config hardware in work queue" into camera-kernel.lnx.4.0 2020-02-26 13:14:11 -08:00
Camera Software Integration
64ac46e64e Merge "msm: camera: ife: Improve logs" into camera-kernel.lnx.4.0 2020-02-26 13:14:02 -08:00
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
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