Граф коммитов

672 Коммитов

Автор SHA1 Сообщение Дата
Linux Build Service Account 67b34a609a Merge 23e645d7f5 on remote branch
Change-Id: I49ad4016d103a0a3cba10efdefe204b97327aad5
2021-09-19 21:52:16 -07:00
Camera Software Integration 23e645d7f5 Merge "msm: camera: cdm: Acquire mutex lock before accessing client data" into camera-kernel.lnx.3.1 2021-09-12 10:46:44 -07:00
Shravya Samala 893c1a8295 msm: camera: cdm: Acquire mutex lock before accessing client data
There is a chance of use after release of client data in
cdm internal operation calls. Hence acquire mutex lock whenever
accessing client data to avoid use after release scenario.

CRs-Fixed: 3010261
Change-Id: Iaf7f41d56301299a6f63a5dc1090334063019881
Signed-off-by: Shravya Samala <shravyas@codeaurora.org>
2021-09-07 01:13:46 -07:00
Linux Build Service Account 4fadc54602 Merge b1ac875feb on remote branch
Change-Id: I46746b815543ce5660af3f6d6146d918769f5412
2021-09-05 23:24:27 -07:00
Trishansh Bhardwaj 85689be983 msm: camera: sync: Prevent OOB access of sync name
Issue:
strlcpy calls strlen on src ptr. If src is not NULL terminated then OOB
access will occur in below stack.
  strlen
  strlcpy
  cam_sync_init_row
  cam_sync_handle_create
  cam_sync_dev_ioctl

Fix:
Pad user-space supplied name with NULL.

CRs-Fixed: 3010262
Change-Id: Ib5c2fbfe395025ec05e0bb2980f86111e95ff54c
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2021-09-01 02:51:37 -07:00
Camera Software Integration b1ac875feb Merge "msm: camera: flash: Add support for flash stream off" into camera-kernel.lnx.3.1 2021-08-30 00:48:05 -07:00
Camera Software Integration e24cc49b5c Merge "msm: camera: isp: Reapply bubble request in RDI path" into camera-kernel.lnx.3.1 2021-08-23 11:46:36 -07:00
Linux Build Service Account ff77ea6b60 Merge 2b619fd268 on remote branch
Change-Id: If03277e2dd29c63bc4079f1e155080956beb4c0a
2021-08-23 01:59:13 -07:00
shiwgupt 0c9bd2865b msm: camera: flash: Add support for flash stream off
- Apply flash off register settings at the time of stream off.
- Add support to send fire command in initial config command.

CRs-Fixed: 2998772
Change-Id: I8897a68e637d283afd98e386b6a7b1fbaaf63c61
Signed-off-by: shiwgupt <shiwgupt@codeaurora.org>
2021-08-19 09:27:45 +05:30
Wyes Karny 9535366b65 msm: camera: isp: Reapply bubble request in RDI path
For recovery of the bubble the request from active list
should be added back to pending request list.

Change-Id: I8d7d6726ddc3e720665e53e4979a7907b09d86aa
CRs-Fixed: 3011917
Signed-off-by: Wyes Karny <wkarny@codeaurora.org>
2021-08-16 15:00:09 +05:30
shiwgupt 2b619fd268 msm: camera: flash: Handle I2C flash request deletion
Handle I2C flash request deletion in the buffer so that
new request can be added.

CRs-Fixed: 3002966
Change-Id: I774a49c687832ef566071ae3ec4249bf425e94c2
Signed-off-by: shiwgupt <shiwgupt@codeaurora.org>
2021-08-10 14:47:03 +05:30
Linux Build Service Account 0fa94eb694 Merge 5ab24d0f0c on remote branch
Change-Id: Ie8e8a58845c18b25dceba75fa78ecae14541562d
2021-08-01 21:36:59 -07:00
Camera Software Integration 5ab24d0f0c Merge "msm: camera: sensor: Read gpios property from dt node" into camera-kernel.lnx.3.1 2021-07-24 07:04:27 -07:00
Camera Software Integration da5d1def8c Merge "msm: camera: tfe: Fix CSID probe" into camera-kernel.lnx.3.1 2021-07-24 06:57:41 -07:00
Alok Pandey d59ab976dd msm: camera: ope: Correctng OPE version for KHAJE
OPE probe is failing due to incorrect OPE version.
Correcting OPE version as a fix.

CRs-Fixed: 2994159
External Impact: No
Change-Id: I8c4de8aa76c1da883a922b1ca873b31e8937ca03
Signed-off-by: Alok Pandey <akumarpa@codeaurora.org>
2021-07-19 14:44:14 +05:30
Tony Lijo Jose 47cb7dc083 msm: camera: sensor: Read gpios property from dt node
Currently cam-res-mgr uses the virtual gpio number (A global gpio number
among all the gpio modules) in case of shared gpio. We cannot know this
upfront as the mapping varies between targets. This change allows to use
the shared gpios using gpios property, where we can mention the gpio module
and the gpio number used.

CRs-Fixed: 2994159
Change-Id: Ic60eeace89e5223eaeee5a7709bb3beee4127bb0
Signed-off-by: Tony Lijo Jose <tjose@codeaurora.org>
2021-07-19 13:22:01 +05:30
Alok Pandey 3e723e5d21 msm: camera: tfe: Fix CSID probe
CSID probe is failing due to PPI getting probed later than CSID.
Fix:
 - PPI initialization failure as non-fatal.
 - Reordering compilation to call PPI probe before csid.

CRs-Fixed: 2994159
External Impact: No
Change-Id: I43948b28ef044eaaef2c72027e991f1fa63bee02
Signed-off-by: Alok Pandey <akumarpa@codeaurora.org>
2021-07-19 03:29:36 +05:30
Linux Build Service Account c60aa7dab8 Merge a50c3608d6 on remote branch
Change-Id: I567e607fa24fb592e6d1a602dcf9db91cf467f90
2021-07-02 00:04:03 -07:00
Camera Software Integration ad4b86bd53 Merge "msm: camera: csiphy: Update CSIPHY settings as per HPG" into camera-kernel.lnx.3.1 2021-06-28 22:41:54 -07:00
Camera Software Integration 1d79547b4c Merge "msm: camera: flash: Add support for I2C flash" into camera-kernel.lnx.3.1 2021-06-28 22:41:24 -07:00
Camera Software Integration 094c2d94dc Merge "msm: camera: isp: Added PPI driver functionality" into camera-kernel.lnx.3.1 2021-06-28 22:40:28 -07:00
Anil Kumar Kanakanti 09c9c132ce msm: camera: csiphy: Update CSIPHY settings as per HPG
CSIPHY settings updated based on latest HPG settings.

CRs-Fixed: 2974853
Change-Id: I3cb3d25bddf707ee9d57a145e0506487b12e487e
Signed-off-by: Anil Kumar Kanakanti <akanakan@codeaurora.org>
2021-06-23 03:11:58 -07:00
shiwgupt 1540124a6e msm: camera: flash: Add support for I2C flash
- Add Regulator power up for I2C flash
- Add GPIO support in probe call for I2C flash
- Add flash type in query capability call of flash.

CRs-Fixed: 3660915
Change-Id: I64ecba3fa4176972e819b11f2a65340c24f85d4f
Signed-off-by: shiwgupt <shiwgupt@codeaurora.org>
2021-06-21 21:33:47 +05:30
Camera Software Integration a50c3608d6 Merge "msm: camera: csiphy: Propagate CSIPHY settings for 1.2.1" into camera-kernel.lnx.3.1 2021-06-18 06:12:19 -07:00
Camera Software Integration 02996c689b Merge "msm: camera: cdm: Add support for CDM 2.1" into camera-kernel.lnx.3.1 2021-06-14 23:13:31 -07:00
Camera Software Integration af3afa6b8c Merge "msm: camera: cpas: Add support for Khaje Camera" into camera-kernel.lnx.3.1 2021-06-14 23:13:11 -07:00
shiwgupt d1785b6f9f msm: camera: csiphy: Propagate CSIPHY settings for 1.2.1
CSIPHY settings are propagated for version 1.2.1 from
4.0 to 3.1.

CRs-Fixed: 2966344
Change-Id: Id315bfcde4c29d2fa491be17d46544371716c5a9
Signed-off-by: shiwgupt <shiwgupt@codeaurora.org>
2021-06-10 18:49:53 +05:30
Ayush Kumar 66dc2207fe msm: camera: isp: Added PPI driver functionality
PPI is a bridge between CSIPHY and CSID. Responsibilty of this driver is to
enable and configure PPI bridge from CSID as per the configuration.

CRs-Fixed: 2960970
Change-Id: I0606b8ee06f6fbc2f84c3be628f356192a79f5a5
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2021-06-10 12:58:22 +05:30
Ayush Kumar d86bddbd78 msm: camera: cpas: Add support for Khaje Camera
Khaje has different version of CPAS version which
requires camnoc interface changes and CPAS version
change. This change adds the same.

CRs-Fixed: 2960970
Change-Id: Iff58b7872129966879ecadab058d1d57cd439bea
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2021-06-08 12:03:19 +05:30
Vikram Sharma b06743ea61 msm: camera: isp: Check ife out res validity
This change adds validity check for ife out res. If ife out res is
NULL we can run into crash or issues.

CRs-Fixed: 2915741
Change-Id: I8722b2a4e2634bda42f0080e00bf09050bbd6b91
Signed-off-by: Vikram Sharma <vikramsa@codeaurora.org>
2021-06-07 18:30:53 +05:30
Ayush Kumar d48a76255d msm: camera: cdm: Add support for CDM 2.1
This change adds CDM 2.1 support.

CRs-Fixed: 2960970
Change-Id: I8cca47a59304c15c7673de398454ab0e99506dab
Signed-off-by: Ayush Kumar <ayushkr@codeaurora.org>
2021-06-06 01:34:12 +05:30
Linux Build Service Account 93d7100135 Merge 7305ccde14 on remote branch
Change-Id: Ic4b170d5b7c9cbf5a0e45d85b32a38a221e40a03
2021-05-07 01:34:25 -07:00
Karthik Jayakumar 7305ccde14 msm: camera: cdm: Fix of_match table null entry
KASAN identified global-out-of-bounds issue on:
msm_cam_hw_cdm_dt_match
Due to no null-terminating struct in the array.

CRs-Fixed: 2883523

Change-Id: I36e4811f239993e1e6de158df959157217c28bfe
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2021-04-28 17:58:01 +05:30
Linux Build Service Account 60fa0a895f Merge 57996acb86 on remote branch
Change-Id: Ib7716e5075eef2f2d1b4d18626b32e29502dc781
2021-01-21 20:53:08 -08:00
Camera Software Integration 57996acb86 Merge "msm: camera: reqmgr: Do not trigger UMD recovery in WQ congestion" into camera-kernel.lnx.3.1 2020-12-29 06:21:53 -08:00
Linux Build Service Account a00f91f3d7 Merge 55ad64a296 on remote branch
Change-Id: I3d4fbd9d60383a27a903813089d6832e729e313d
2020-12-23 02:26:03 -08:00
Wyes Karny acb41133c9 msm: camera: reqmgr: Do not trigger UMD recovery in WQ congestion
In WQ congestion case do not trigger UMD recovery as for back to back
apply, apply failure is expected because ISP is in still in applied
state.

CRs-Fixed: 2840473
Change-Id: Ib57e1db1e5bf8f20e5e454d985efc002d50e3ba6
Signed-off-by: Wyes Karny <wkarny@codeaurora.org>
2020-12-09 18:57:08 +05:30
Alok Chauhan 55ad64a296 msm: camera: cdm: Added cdm power state check
There is chance that handle error info get scheduled
after cdm deinit. As clock and regulator gets disabled
as part of deinit so this can cause issue for cdm hw
interaction as part of handle error.

Added cdm power state check before dumping CDM HW
status at the time of error.

CRs-Fixed: 2833653
Change-Id: I4bf01ce3900196909cf66ffdb24607c50ab03295
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
2020-12-09 12:44:04 +05:30
Sridhar Gujje a405c45b1c Merge "msm: camera: ope: handle unlocking in process timer" into camera-kernel.lnx.3.1 2020-11-28 08:56:32 -08:00
Camera Software Integration 9606835395 Merge "msm: camera: ope: Add support to dynamic switch pix_pattern" into camera-kernel.lnx.3.1 2020-11-24 00:26:57 -08:00
Alok Chauhan 43188bce45 msm: camera: ope: handle unlocking in process timer
In process timer, if there are no empty taks then it
returns without unlocking context mutext. This lead
to deadlock later if other tasks are waiting on this
lock.

CRs-Fixed: 2823721
Change-Id: I478d1797be59d975e9d58e005a5fad5c22656f51
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
2020-11-23 13:02:13 +05:30
Rishabh Jain 9466904129 msm: camera: ope: Add support to dynamic switch pix_pattern
Add support to dynamically switch pix_pattern of read clients
based on data received in each request.

CRs-Fixed: 2811530
Change-Id: Icb3ebd33cae59b8db87bc0011d6560492ad29c3a
Signed-off-by: Rishabh Jain <risjai@codeaurora.org>
2020-11-11 09:36:04 +05:30
Alok Chauhan b91c235d7f 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-10 16:05:10 +05:30
Linux Build Service Account 2f785d35e4 Merge 86afe4d27e on remote branch
Change-Id: If117dc4b8922f979dc041e2fe60cbe2918d8501c
2020-10-23 20:38:50 -07:00
Linux Build Service Account 5ae83f94fd Merge 3b6dc3d456 on remote branch
Change-Id: I33c861fe4076f11e2706f386a08b9a0960e5a3b3
2020-09-22 06:02:53 -07:00
Camera Software Integration 86afe4d27e Merge "msm: camera: ope: Increase max bl limit" into camera-kernel.lnx.3.1 2020-09-18 04:35:01 -07:00
Camera Software Integration 1eb9cf9ad8 Merge "msm: camera: cdm: Decrement write-count only after Bl commit" into camera-kernel.lnx.3.1 2020-09-18 04:34:45 -07:00
Shravya Samala 7bacf1d4c1 msm: camera: tfe: TPG stop Call
Move TPG stop call before checking if
Deinit call is required or not.

CRs-Fixed: 2777023
Change-Id: I9c7be620c2ba2762324129e547efc1d2a8dd6f40
Signed-off-by: Shravya Samala <shravyas@codeaurora.org>
2020-09-15 12:52:54 +05:30
Shravya Samala 92a550e962 msm: camera: cdm: Decrement write-count only after Bl commit
After Hw Bl cmd write, we are decrementing write count.
Again after committing BL we are decrementing write count.
Due to this there is a chance of write count becoming -1 thus
leading to CDM overflow issue. Hence decrement write count
only after committing BL.

CRs-Fixed: 2768031
Change-Id: I8faf6ea7d5e9e34e1e034c89132ed131b4d6cafc
Signed-off-by: Shravya Samala <shravyas@codeaurora.org>
2020-09-15 11:53:59 +05:30
Rishabh Jain 397738b979 msm: camera: ope: Increase max bl limit
Increase max bl limit for OPE to 24 to support maximum
48 stripes.

CRs-Fixed: 2761455
Change-Id: I961be1344fac0084649df321225e94a50d4e5a98
Signed-off-by: Rishabh Jain <risjai@codeaurora.org>
2020-09-11 15:46:09 +05:30