25705 Commits

Author SHA1 Message Date
qctecmdr Service
213a3c20a0 Merge "msm: npu: Add ssr support in dsp mode" 2018-09-14 14:15:18 -07:00
qctecmdr Service
edeb150079 Merge "msm: vidc: fix a return value uninitialized issue" 2018-09-13 19:28:09 -07:00
Jilai Wang
74460600d5 msm: npu: Add ssr support in dsp mode
When npu software runs in dsp mode, part of ssr handling will be
done in dsp. This change is to handle this case properly.

Change-Id: I63d49e117f56dbb489ef3065b764ade9f1f4c3e6
Signed-off-by: Jilai Wang <jilaiw@codeaurora.org>
2018-09-13 17:53:53 -04:00
Jigarkumar Zala
4c33b1ae41 UPSTREAM commit 'b644f8d2d11a8d98f34a4c2716bd1aade9b2e068' 09/13
* commit 'b644f8d2d11a8d98f34a4c2716bd1aade9b2e068':
  msm: camera: csid: Disable CSI Rx upon fatal errors
  msm: camera: isp: Select epoch config based on Hardware
  msm: camera: csiphy: Correct delay when configure device
  msm: camera: flash: Add torch handling in early PCR
  msm: camera: core: Check context state prior to handle release
  ARM: dts: msm: Add camera actuator regulator load-current
  msm: camera: mem: Remove lock from get_cpu_buf unless mapping
  ARM: dts: msm: Add lowsvs clock support for IPE for sm8150 platform
  msm: camera: lrme: Fix the unpack config and add dump function
  msm: camera: eeprom: set platform driver data to null
  ARM: dts: msm: Set the bound as multiple of 1MB
  msm: camera: lrme: Add handler function to support early PCR
  msm: camera: delete i2c data in release dev
  msm: camera: cpas: Disable camnoc ubwc settings for sm6150
  msm: camera: isp: Handle bus error in bottom half
  ARM: dts: msm: Add support for irs1645 sensor
  msm: camera: Replace mutex lock with context spin lock
  msm: camera: isp: support composite fence id
  msm: camera: reqmgr: Remove mem_mgr init & deinit calls
  msm: camera: sync: Add warning logs

Change-Id: I907a68185192d164a2ac5e74bbe1ba42c74a6d41
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2018-09-13 11:57:20 -07:00
Qiwei Liu
635bd3e07f msm: vidc: fix a return value uninitialized issue
Fix the return value uninitialized issue in flush_buffer.

Change-Id: Ie1ee94877e788dd8a4454ff8f96f566bc9c94902
Signed-off-by: Tapas Kumar Kundu <tkundu@codeaurora.org>
2018-09-13 11:01:59 -07:00
qctecmdr Service
000d7f0fcf Merge "msm: vidc: Enable dcvs for sm6150" 2018-09-12 21:19:01 -07:00
qctecmdr Service
6295107aaa Merge "msm: vidc: Fix color format for HW HEIC encode" 2018-09-12 17:08:14 -07:00
qctecmdr Service
1d6e3472c8 Merge "msm: npu: Change ipc irq type to level high" 2018-09-12 17:08:13 -07:00
qctecmdr Service
ab332e41a6 Merge "UPSTREAM: commit '8a92c94c8086e38bc900d7f7c8443375b2d62c67' 08/29" 2018-09-12 13:24:20 -07:00
qctecmdr Service
e49c3a57cd Merge "msm: vidc: skip init clock and bus data entry for cvp session" 2018-09-12 13:24:19 -07:00
Govindaraj Rajagopal
0c325cc9c9 msm: vidc: Enable dcvs for sm6150
Enable dcvs for sm6150

CRs-Fixed: 2295372
Change-Id: I7abae76f1c01936849292970dcd965e0286134fc
Signed-off-by: Govindaraj Rajagopal <grajagop@codeaurora.org>
2018-09-12 15:39:35 +05:30
Harsh Shah
b644f8d2d1 msm: camera: csid: Disable CSI Rx upon fatal errors
When we encounter fatal errors, this change will reset the
Rx Cfg registers. This will stop the error IRQs from being
triggered continuously.

Change-Id: Idc7a68d37a3c91c9bccf5962d168c3529f41723f
Signed-off-by: Harsh Shah <harshs@codeaurora.org>
2018-09-11 18:54:27 -07:00
qctecmdr Service
a40f5e28d2 Merge "msm: vidc: Introducing CBR_VFR upto 480p@30fps" 2018-09-11 18:25:59 -07:00
qctecmdr Service
6aa25ee1f6 Merge "msm: vidc: fix encoder bw voting for rc_off case" 2018-09-11 18:25:56 -07:00
Jeyaprakash Soundrapandian
9f766890eb Merge "msm: camera: core: Check context state prior to handle release" into dev/msm-4.14-camx 2018-09-11 14:19:50 -07:00
Abhilash Kumar
e7a76d4d5a msm: camera: isp: Select epoch config based on Hardware
Select the EPOCH to twenty for lines devices other than
SM8150

Change-Id: I238196a7a3e26e5bec74432372f068ec35eb080c
Signed-off-by: Abhilash Kumar <krabhi@codeaurora.org>
2018-09-11 13:49:57 -07:00
Jeyaprakash Soundrapandian
b2a3370284 Merge "msm: camera: csiphy: Correct delay when configure device" into dev/msm-4.14-camx 2018-09-11 13:25:32 -07:00
Jilai Wang
7f38ba44c2 msm: npu: Change ipc irq type to level high
npu ipc irq type should be level high instead of rising edge.
This change is to correct it.

Change-Id: I76c3e08a3a59ddd16ca540702753b6185a84c248
Signed-off-by: Jilai Wang <jilaiw@codeaurora.org>
2018-09-11 12:36:25 -04:00
Jigarkumar Zala
ea4e04fe7b msm: camera: csiphy: Correct delay when configure device
During streamon ioctl, lane configuration register writing
is introducing unncessary delay. This change fixes this error as
well as add check condition to add delay when it is non zero
to improve performance.

Change-Id: Ifacfea9a3d8d8071331982cb853bc53c3c1928dc
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2018-09-10 18:36:51 -07:00
Tapas Kumar Kundu
595d428ab1 msm: vidc: Introducing CBR_VFR upto 480p@30fps
Introducing CBR_VFR (CBR = constant bitrate, VFR = variable framerate
) upto 480p@30fps due to tighter bitrate convergence.

Change-Id: I9477761f7f0936a319dc66413a28cddb619ba0cb
Signed-off-by: Tapas Kumar Kundu <tkundu@codeaurora.org>
2018-09-10 18:01:23 -07:00
Jigarkumar Zala
b1f8ae8eec msm: camera: flash: Add torch handling in early PCR
Reentering video recording usecase with flash mode on, flashlow
operation triggered in early PCR to fire Torch. This change
adds FIRELOW opcode to support fire Torch.

Change-Id: Iffc6ad58b31bb27108af890796897dd37240253d
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2018-09-10 17:03:14 -07:00
Venkat Chinta
70a5d5bf61 msm: camera: core: Check context state prior to handle release
This change adds a state check for context before calling a
release on dev handle in order to prevent a release call on
a previously deinitialized context.

Change-Id: I35eedc0b3662c9b556f1e54d19cccc09d15023ab
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2018-09-10 11:26:05 -07:00
Jeyaprakash Soundrapandian
a134943c46 Merge "msm: camera: mem: Remove lock from get_cpu_buf unless mapping" into dev/msm-4.14-camx 2018-09-10 09:54:35 -07:00
Qiwei Liu
bce83addbc msm: vidc: fix encoder bw voting for rc_off case
In rc_off case, bitrate is not set, use a pre-defined
value for bw calculation.

Change-Id: I0ba6a37572d9cfaace6428d8dd4c0a65182de05f
Signed-off-by: Qiwei Liu <qiweil@codeaurora.org>
2018-09-10 18:36:15 +08:00
qctecmdr Service
42042db563 Merge "msm: vidc: amend DCVS buffer count logic" 2018-09-09 08:39:39 -07:00
Maheshwar Ajja
2edbed68a9 msm: vidc: skip init clock and bus data entry for cvp session
Clock and bus data entry is not available for cvp session
and hence skip clock and bus data entry initialization to
avoid cvp session failures.

Change-Id: Iac21d2cc67f368277acefc65d5a18006d34ad584
Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>
2018-09-07 15:56:03 -07:00
Maheshwar Ajja
497bd837cd msm: vidc: amend DCVS buffer count logic
The current DCVS buffer count logic results in zero
buffer count ourside the firmware initially which is
wrong as all the buffers are with client initially.
In some video usecases the buffer count outside the
firmware is never reaching to max threshold number
and driver end up setting increased clock rate always.
To avoid over voting, count the buffers queued to the
firmware (instead of counting buffers outside firmware)
which is acurate from the beginning.

Change-Id: I7a5cd7fddc88ddd96fb1db30c003501938f1a05a
Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>
2018-09-07 15:55:35 -07:00
Maheshwar Ajja
c292b62e69 msm: vidc: do not treat NOC error as fatal error
Do not treat NOC error from firmware as fatal error but
treat it as sys error (similar to other errors) which will
do core release.

Change-Id: I8e402814d3bbb1a27f06f738bd42625353196d31
Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>
2018-09-07 12:13:08 -07:00
Harsh Shah
61205d00b2 msm: camera: mem: Remove lock from get_cpu_buf unless mapping
This change removes mutex_lock/unlock from get_cpu_buf function
unless mapping is required. This helps to remove lock from most
calls to this function. There are no checks anyway to see if
buffer is still in use or not before release. The alloc/map/release
calls have a mutex lock when modifying the different parameters
of the bufq struct. Having a mutex lock in this function does not
resolve anything. So removing this helps to be able to call this
function from tasklets as long as mapping is already done.

Change-Id: I48b195ad5c948ce991d8926538d6f61c2e0eef59
Signed-off-by: Harsh Shah <harshs@codeaurora.org>
2018-09-07 12:06:50 -07:00
Qiwei Liu
1f90b6b54e msm: vidc: fix video encoder bw calculation issues
- fix overflow issue when calculating y_bw_no_ubwc_xbpp
- use FP divide to calculate collocated bw
- use actual bitrate instead of pre-defined value
- use correct value for tnbr_per_lcu
- mese_read multiply with 1.37 factor, not divide
- refine compression factors for input yuv
- use the total bw for DDR+LLC for LLCC ab

Change-Id: I8056c329c267b63609ea9a1e3c596d9b2cb508f0
Signed-off-by: Qiwei Liu <qiweil@codeaurora.org>
2018-09-07 20:59:01 +08:00
Suresh Vankadara
c99cc37c34 Merge "msm: camera: cpas: Disable camnoc ubwc settings for sm6150" into dev/msm-4.14-camx 2018-09-07 04:31:05 -07:00
Jeyaprakash Soundrapandian
d718c6512a Merge "msm: camera: eeprom: set platform driver data to null" into dev/msm-4.14-camx 2018-09-06 15:31:54 -07:00
qctecmdr Service
dfb0c72085 Merge "msm: npu: pass command result from fw to user driver" 2018-09-06 11:44:52 -07:00
qctecmdr Service
065f6bd4dc Merge "msm: vidc: fix some issues in video bw calculation" 2018-09-06 11:44:50 -07:00
Shubhraprakash Das
d03757cdd8 msm: camera: lrme: Fix the unpack config and add dump function
Fix unpack config in fetch engine and add dump function.
adb shell "echo 1 > /sys/kernel/debug/camera_lrme/dump_register"
to dump register when reg update irq is received.

Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
Signed-off-by: Junzhe Zou <jnzhezou@codeaurora.org>
Change-Id: I9ff9843df6cb881a2a0080b852ae376d42a00ed0
2018-09-06 09:44:21 -07:00
Jilai Wang
72a6d615d5 msm: npu: pass command result from fw to user driver
Each command's response from fw will contain a status code which
indicates its execution result. This change is to pass this status
code to user driver as corresponding ioctl command's return code.

Change-Id: I55d1f0b2a70497ed89f48cbdb6a267e5848e5bff
Signed-off-by: Jilai Wang <jilaiw@codeaurora.org>
2018-09-05 15:49:16 -04:00
Vishalsingh Hajeri
ef45a0b6a6 msm: camera: eeprom: set platform driver data to null
when kfree is called on ectrl structure during
driver remove, there is a dangling pointer left
in platform driver data and v4l2 subdevice.
This change will assign these dangling pointers
to NULL.

Change-Id: If65ac2b5f6ac55a274df223ff4ea1b449c0809cf
Signed-off-by: Vishalsingh Hajeri <vhajeri@codeaurora.org>
2018-09-04 20:51:30 -07:00
Amit Shekhar
a763c96bcb msm: vidc: Fix color format for HW HEIC encode
Fix get/set format for HW HEIC encode. Color format for HW HEIC
encode is V4L2_PIX_FMT_NV12_512.

Change-Id: Icf7e43d002ef2120818d3249859ab6425a8cf092
Signed-off-by: Amit Shekhar <ashekhar@codeaurora.org>
2018-08-31 15:07:30 -07:00
Junzhe Zou
54c14f3cf6 msm: camera: lrme: Add handler function to support early PCR
Add config handler in acquire state to allow UMD send packets before
starting the HW.

Change-Id: I3f35adb09fa8fd2d188ffb5569d0b965ec26f2ba
Signed-off-by: Junzhe Zou <jnzhezou@codeaurora.org>
2018-08-31 11:11:32 -07:00
Shankar Ravi
01176f921f msm: camera: delete i2c data in release dev
Previous settings are retained in the list
for i2c init, calib, mode settings for ois.
deleting the settings in the list in the ois
release dev.

Change-Id: I538430c8acd68e8cace2fc3a82e5ee22d03417c0
Signed-off-by: Shankar Ravi <rshankar@codeaurora.org>
2018-08-31 09:22:49 -07:00
Govindaraj Rajagopal
cc578218f5 msm: vidc: Added error handling in clock data structure
Added Conditional check to ensure presence of clock data,
Close the session if it does not exist

Change-Id: I16f06d89c9a8195242fc3715aa13ac12ebcd99c1
Signed-off-by: Govindaraj Rajagopal <grajagop@codeaurora.org>
2018-08-31 05:36:24 -07:00
Ravikishore Pampana
c20f059423 msm: camera: cpas: Disable camnoc ubwc settings for sm6150
SM6150 target has correct default ubwc reset register values for
ipe and bps, so software does not need to write it again.

Change-Id: I67d2ad5562105b0ef147023d70b15159f3525655
Signed-off-by: Ravikishore Pampana <rpampana@codeaurora.org>
2018-08-30 22:17:55 -07:00
Junzhe Zou
9535a4d136 msm: camera: isp: Handle bus error in bottom half
Configure the debug status registers during bus init
and read the value of debug status during bottom half
processing when the bus error occurs. Print out
the client causing the bus violation based on debug
status value.

Change-Id: Ibf6ac60affc7102e2495610213ef2c9504c7c54e
Signed-off-by: Junzhe Zou <jnzhezou@codeaurora.org>
Signed-off-by: Vishalsingh Hajeri <vhajeri@codeaurora.org>
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2018-08-30 21:34:31 -07:00
Qiwei Liu
adf56c3a00 msm: vidc: fix some issues in video bw calculation
- don't check zero value entries for CR/CF
- initialize dpb_compression_enabled to true
- fix overflow issue when calculating y_bw_no_ubwc_xbpp
- use FP divide to calculate collocated bw
- use the same compression factor for both DPB read and write
- refine LLC DPB read bw calculation
- refine OPB BW calculation
- enable LLC top line buffer for H264/VP8/MPEG2
- set correct lcu_size 32 for VP9

Change-Id: Ie0e5b64caa64d7c9833b8685eb013596d715f0d7
Signed-off-by: Qiwei Liu <qiweil@codeaurora.org>
2018-08-30 21:10:34 -07:00
Karthik Anantha Ram
4a19905433 msm: camera: Replace mutex lock with context spin lock
This change removes the context mutex lock for the entire
function when applying a request. With this change, the lock
window is reduced thereby improving performance.

Change-Id: Ibc387173b4da0d2c92604a01e9123572019b6469
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2018-08-30 11:11:33 -07:00
Jeyaprakash Soundrapandian
30e626bc1b Merge "msm: camera: sync: Add warning logs" into dev/msm-4.14-camx 2018-08-30 10:39:27 -07:00
Jeyaprakash Soundrapandian
6587ac72e5 Merge "msm: camera: isp: support composite fence id" into dev/msm-4.14-camx 2018-08-30 09:42:36 -07:00
Jeyaprakash Soundrapandian
1e72f411e5 Merge "msm: camera: reqmgr: Remove mem_mgr init & deinit calls" into dev/msm-4.14-camx 2018-08-30 09:35:39 -07:00
qctecmdr Service
035ea10108 Merge "msm: vidc: fix DCVS logic issues" 2018-08-30 09:03:13 -07:00
qctecmdr Service
4b475d4a24 Merge "msm: vidc: correct CVP usecase bandwidth calculations" 2018-08-30 01:16:14 -07:00