Commit graph

578780 commits

Author SHA1 Message Date
Shubhraprakash Das
4d0a1adb96 msm: camera: isp: Reserve unified buffer(ub) space for rdi
Rdi and pix interfaces can operate on different camera and they
can start/stop independently. If once camera uses entire ub then
another camera will not get any ub resulting in overflow. Fix
this problem by reserving space for rdi interface in ub.

CRs-Fixed: 1087367
Change-Id: I66f03cec28d7e3ecda42c06f01eb18fd869c913b
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
2016-12-01 23:52:48 -08:00
Shubhraprakash Das
2527a06cae msm: camera: isp: Dual camera sync feature
Add ioctl to swicth dual camera mode from sync to
unsync mode and vise versa. Also, change the logic
of frame id sync to support unsync mode.

CRs-Fixed: 1070296
Change-Id: I58e27c9ea66f1788d640bf523e7c6569cde162f7
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
Signed-off-by: Junzhe Zou <jnzhezou@codeaurora.org>
2016-12-01 23:52:31 -08:00
Shubhraprakash Das
c30b1bc021 msm: camera: isp: Increment stats active counter
The stats active counter was not being incremented, fix it.

CRs-Fixed: 1084238
Change-Id: I07b3c000836955eab9cf2273ce535c4317b3f166
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
2016-12-01 23:51:41 -08:00
Linux Build Service Account
b979f780bf Merge "msm: mdss: hdcp_1x: remove obsolete code" 2016-12-01 23:47:40 -08:00
Linux Build Service Account
866aa12eb4 Merge "uapi/media: add additional ubwc compressed formats" 2016-12-01 23:47:39 -08:00
Linux Build Service Account
daa2c4f942 Merge "mm: Inform KASAN when allocating pages during isolation" 2016-12-01 23:47:38 -08:00
Linux Build Service Account
e349b1b10c Merge "net: rmnet_data: Handle leaked packets when adding MAP fields in TX" 2016-12-01 23:47:37 -08:00
Shubhraprakash Das
77029f9744 msm: camera: isp: Fix recovery in dual vfe mode
In case of dual vfe overflow recovery was failing because
the dual streams were not reset on both vfe. Fix the issue
with this change.

CRs-Fxied: 1076758
Change-Id: Iee81103263d95d93947a3967b1a3dbb568f76cf1
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
2016-12-01 23:41:51 -08:00
Rajesh Kemisetti
8a706cbc3d msm: kgsl: Check MMU type for memory and pagetable operations
Check MMU type for below operations to make NOMMU functional:

- adreno_iommu_set_pt_ctx() tries to set pagetable during context
  switch without really checking on type of MMU.
- skip tracking of gpuaddr in case of NoMMU during
  kgsl_mem_entry_track_gpuaddr().
- In case of nommu the function kgsl_allocate_global() should
  always allocate contiguous memory from CMA.

Change-Id: I8cb59e1475376167c7a8a60c54df0939597f5083
Signed-off-by: Rajesh Kemisetti <rajeshk@codeaurora.org>
2016-12-01 23:25:18 -08:00
Aditya Bavanari
3522bcb2dd ASoc: msm: Add changes to support multiple meta key value pairs
Add changes to get the cal_block on the basis of meta key
and set the license in core with the obtained cal_block

CRs-Fixed: 1093003
Change-Id: I7c931ca0ad4eed4da9252a05ee426d2ef4bd10b1
Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2016-12-01 22:48:24 -08:00
Taniya Das
7511463229 ARM: dts: msm: Remove clocks associated with GDSC for MSMfalcon/Trition
The clients of each GDSC would take care of any memory requirement of the
associated clocks, so remove them from GDSC.

Change-Id: Ic2df5ba83d1e7166aadc954aa137ec65ffa79133
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2016-12-02 09:24:35 +05:30
Taniya Das
355e6dba7d clk: msm: Remove overrides from clock header files for common clock
For clients using msm-clk-provider.h and msm-clk.h
header files, no override is expected for COMMON_CLK
framework so fixing the same by conditionally compiling
the clock header files.

Change-Id: I5f7393f3f486a884bfa881a93c01623c3cd2664d
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2016-12-02 09:24:34 +05:30
Linux Build Service Account
b832093be4 Merge "sched: pre-allocate colocation groups" 2016-12-01 16:39:40 -08:00
Linux Build Service Account
a7adb0df6b Merge "msm: mdss: restore pipe src/dst rect after multiple PU ROI update" 2016-12-01 16:39:39 -08:00
Linux Build Service Account
74e95335c0 Merge "ASoc: msm: qdsp6v2: Add TX app type support in compress driver" 2016-12-01 16:39:37 -08:00
Linux Build Service Account
15b248e390 Merge "msm: camera: fix bound check of offset to avoid overread overwrite" 2016-12-01 16:39:36 -08:00
Linux Build Service Account
a0918ede1c Merge "msm: camera: Print kernel pointer using correct specifier" 2016-12-01 16:39:35 -08:00
Linux Build Service Account
60297d105f Merge "msm: camera: jpegdma: Check for compat config" 2016-12-01 16:39:34 -08:00
Linux Build Service Account
689f29df32 Merge "msm: camera2: cpp: Added secure buffer [un]mapping" 2016-12-01 16:39:33 -08:00
Linux Build Service Account
3c74e592e8 Merge "msm: mdss: dp: set crypto clock rate" 2016-12-01 16:39:32 -08:00
Linux Build Service Account
dff68b7e79 Merge "msm: mdss: hdcp_1x: update hdcp state on link integrity failures" 2016-12-01 16:39:31 -08:00
Linux Build Service Account
0d27592c3b Merge "msm: mdss: dp: hdcp 2.2: add support for interrupt handling" 2016-12-01 16:39:30 -08:00
Linux Build Service Account
d3191bd934 Merge "msm: mdss: avoid scheduling pp work during continuous updates" 2016-12-01 16:39:28 -08:00
abeykun
d8595e1f56 uapi/media: add additional ubwc compressed formats
Patch adds RGB565, RGBA 10-bit and P010 10-bit ubwc
compressed formats support to media API planes calculation.
Also fix in align macro when alignment is not a power of 2.

CRs-Fixed: 1096408
Change-Id: I4afcf7d5b22395eeda2e77131bd45592abaeb561
Signed-off-by: abeykun <abeykun@codeaurora.org>
Signed-off-by: Umesh Pandey <umeshp@codeaurora.org>
2016-12-01 16:25:17 -08:00
Puja Gupta
480f3956fd soc: qcom: Check err_ready before returning from subsys_generic_handler()
Allow subsys_generic_handler() to check for err_ready interrupt before
returning, so that subsystem_powerup() can complete successfully during
ssr.

CRs-Fixed: 1094829
Change-Id: I3e91bd2a2189508968f4c5cc62933a13986c6afa
Signed-off-by: Puja Gupta <pujag@codeaurora.org>
2016-12-01 16:24:41 -08:00
Ajay Singh Parmar
9ae0fdc9fe msm: mdss: hdcp_1x: remove obsolete code
Remove HLOS and TZ communication mechanism which is
using SCM APIs. New hardware supports programming in
HLOS itself. Also, communication is now handled by
qseecom APIs. This makes SCM code obsolete and redundant.
Remove any such code which is not being used in current
hardware.

Change-Id: I9b120b88f92be517d1734697625038b28b32feb1
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>
2016-12-01 14:19:35 -08:00
Subbaraman Narayanamurthy
4f1454facc ARM: dts: msm: Update ascent battery profile for GEN3 FG
As per the recent battery characterization, update the profile
data for ascent battery used with pmi8998 FG.

Change-Id: I405cb68749f63f6f779e4f3c2b47065b02ec07de
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2016-12-01 13:04:40 -08:00
Chinmay Sawarkar
e07d8796c5 ARM: dts: msm: Add vmem slave bus usecase to vmem in msm8998
On 8998 v2 there is a hard requirement that "clk_set_rate"
must be set before "clk_enable". In the case of vmem, bus driver
can do this only if the order of vmem slave & vmem cfg bw vote
is enforced. These usecases will be used for ensuring bw voting order.

Change-Id: Ic7d17b7aa33f394db83dfa9cec440c9d8951c2c0
CRs-Fixed: 1091417
Signed-off-by: Chinmay Sawarkar <chinmays@codeaurora.org>
2016-12-01 12:49:19 -08:00
Joonwoo Park
7437cd7c4b sched: pre-allocate colocation groups
At present, sched_set_group_id() dynamically allocates structure for
colocation group to assign the given task to the group.  However
this can cause deadlock as memory allocator can wakeup a task which
also tries to acquire related_thread_group_lock.

Avoid such deadlock by pre-allocating colocation structures.  This
limits maximum colocation groups to static number but it's fine as it's
never expected to be a lot.

Change-Id: Ifc32ab4ead63c382ae390358ed86f7cc5b6eb2dc
Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org>
2016-12-01 11:28:01 -08:00
Yuanyuan Liu
d9a8fa86c0 icnss: Add support of setting MAC address from platform driver
Add support of setting WLAN MAC address from platform driver.
The MAC address will be passed to WLAN driver when WLAN is
turned on.

CRs-Fixed: 1096286
Change-Id: I249222b419dd130241cbc84f4d41709b408941e0
Signed-off-by: Yuanyuan Liu <yuanliu@codeaurora.org>
2016-12-01 10:56:24 -08:00
Veera Sundaram Sankaran
55931ab731 msm: mdss: restore pipe src/dst rect after multiple PU ROI update
During multiple partial update, each pipe is checked against
the two ROIs and the pipe's src and dst rect are cropped and
adjusted with respect to first_roi or second_roi, based on its
position. If the pipe is used with the same configs in the next
kickoff, restore the pipe's actual src/dst before continuing with
the kickoff.

Change-Id: I1db579626d96302e07fef1a755fb39944d3eaca8
Signed-off-by: Veera Sundaram Sankaran <veeras@codeaurora.org>
2016-12-01 10:49:31 -08:00
Satish Babu Patakokila
0661cfb2a3 ASoc: msm: qdsp6v2: Add TX app type support in compress driver
Add TX app type support in compress driver to support different
post processing modules per COPP in the TX path

CRs-fixed: 1072067
Change-Id: I8e84577b5aff5e932632c4612a88808615d764ae
Signed-off-by: Satish Babu Patakokila <sbpata@codeaurora.org>
2016-12-01 23:08:48 +05:30
Satish Babu Patakokila
160813b82f ASoc: msm: qdsp6v2: Add timestamp support for compress capture
Add timestamp support for compress driver.
Modify ASM driver to read the buffer from predefined offset.

CRs-fixed: 1072067
Change-Id: I1c46befc223285495b3c0650e6c3eaae81f58771
Signed-off-by: Satish Babu Patakokila <sbpata@codeaurora.org>
2016-12-01 22:58:18 +05:30
Linux Build Service Account
c2cbb11bf9 Merge "msm: hdcp: add response timeout and new messages for sink" 2016-12-01 09:23:49 -08:00
Linux Build Service Account
bfaad619ea Merge "Input: synaptics: check input, prevent sysfs races" 2016-12-01 09:23:48 -08:00
Linux Build Service Account
6b90aa18be Merge "mmc: core: check if CQE is already disabled before halt/unhalt" 2016-12-01 09:23:47 -08:00
Linux Build Service Account
e7211aacd5 Merge "msm: mdss: add support to set mdp clock rate before enable" 2016-12-01 09:23:46 -08:00
Linux Build Service Account
27d5c36477 Merge "msm ipa3: fix blocking faulty IOCTLs" 2016-12-01 09:23:45 -08:00
Linux Build Service Account
42335fc5e3 Merge "mmc: block: send CMD13 when a response error detected in CQ mode" 2016-12-01 09:23:44 -08:00
Srinivas Ramana
c3f3cfdb7f ARM: dts: msm: Add cpu cache nodes for msmfalcon
Add cpu cache nodes to represent the cache hierarchy and
to specify the dump size of each cache.

While at it also add the cache dump nodes which will enable
reserving the memory for cache dumps.

Change-Id: I06eead417b77c74a6e12e6f6b5251c0c7e62c96b
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2016-12-01 18:47:00 +05:30
Deepak Kushwah
232554ded3 msm: vidc: Fix kw issues
Currently we are using the argument passed to
the function to fill the array values as is
without checking for the sanity. This commit
will add a sanity check on function argument
to avoid array index out of bound access.

Change-Id: I5f23f036441a67a3f3828cc432ea57c1c06bc8ae
CRs-Fixed: 1096134
Signed-off-by: Deepak Kushwah <dkushwah@codeaurora.org>
2016-12-01 03:08:15 -08:00
Ajay Agarwal
abe1a7d157 usb: gadget: f_rmnet: Add support for configfs
Add APIs to allocate and instanciate f_rmnet function
driver using configFS.

Change-Id: Iad76a7e317dd9caf846dbe870baee63a8c5ce6c1
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2016-12-01 14:04:57 +05:30
Deepak Kushwah
1899dd7e67 msm: vidc: change format specifier for size_t
size_t is an unsigned integer. Change format specifier
to resolve compilation issues for 32 bit.

Change-Id: I4309335c7ad0c695081d446a3f90e84edbcf1e32
CRs-Fixed: 1096066
Signed-off-by: Deepak Kushwah <dkushwah@codeaurora.org>
2016-12-01 00:20:00 -08:00
Sayali Lokhande
07eb9e42cf ARM: dts: msm: Add sdhc2 support for msmfalcon interposer
Add sdhc2 support to enable SD card for msmfalcon
interposer platform.

Change-Id: I22df2ab1210d0ec7da1ac394e6c61beaa52eb712
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2016-12-01 12:12:14 +05:30
Sahitya Tummala
9b97ea99ee mmc: core: check if CQE is already disabled before halt/unhalt
Upon any CQ error, the driver tries to halt the CQE first and
if it fails to halt, then CQE is disabled. The error handling
work function mmc_blk_cmdq_err() also tries to HALT the CQE
at couple of places and takes some action based on the HALT
success/error status. But since CQE is disabled, we should not
treat any errors of CQE halt/unhalt as critical and in fact,
we should not even attempt to halt/unhalt.

Change-Id: I6bef9f2c033f78ad0959954acc5d7627e8a92139
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2016-11-30 21:49:31 -08:00
Sahitya Tummala
118ca5d727 mmc: cmdq_hci: enable legacy interrupts when CQ is disabled upon error
The legacy interrupts are enabled as part of CQE halt. But there could
be few cases, where halt fails. In those cases, CQE is disabled without
enabling legacy interrupts. Without this we cannot send any commands
like status CMD13 in legacy mode as part of error handling work.

Change-Id: I944ab4060e779c7f41a945532e6a65c30797d40f
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2016-11-30 21:47:22 -08:00
Sahitya Tummala
53ed8685f6 mmc: sdhci: Handle legacy commands sent in CQ error cases properly
There could be cases where CQE halt might fail and in which
case, CQE gets disabled as part of error handling.
In this case, !mmc_host_halt() will be true and the commands
sent in legacy mode are getting software request timeout errors
as they are getting handled as cmdq irq.
Hence, add !mmc_host_cq_disable() check as well in addition to
!mmc_host_halt() in sdhci_irq() before considering it as a
cmdq irq.

Change-Id: Ic529aae53fdecd6b9ecbb17ba13147964dce55dc
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2016-11-30 21:44:25 -08:00
Ajay Singh Parmar
327a852ba7 msm: hdcp: add response timeout and new messages for sink
As per hdcp 2.2 specifications, send the stream type message
to sink at a specified address in case sink is a receiver.

Update the messages to be sent to sink with the message received
from TZ and tear down the session in case it time's out.

Also, enable encryption after stream management message
exchange for hdcp repeaters to avoid unnecessary link failures.

Change-Id: Ib77756c942abfbdd6e1522a3238d5d8499496fc9
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>
2016-11-30 21:09:56 -08:00
Andrew Chant
ae39f47e9b Input: synaptics: check input, prevent sysfs races
concurrent sysfs calls on the fw updater can cause
ugly race conditions.  Return EBUSY on concurrent sysfs calls.

For sysfs calls which generate deferred work, prevent
the deferred work from running concurrently with other
sysfs calls.

Also check that ext_data_source is appropriately sized
and allocated, based on a patch by
Gengjia Chen (chengjia4574@gmail.com).

Signed-off-by: Andrew Chant <achant@google.com>
Change-Id:I5bbe4992f3fd2d23db288296eaeb61f5831098e9
Bug: 30799828
Bug: 31252388
Git-repo: https://android.googlesource.com/kernel/msm.git
Git-commit: 287ce2ccfefe68067c1f9f5175b6664bf7397fe6
Signed-off-by: Srinivasa Rao Kuppala <srkupp@codeaurora.org>
2016-12-01 10:28:16 +05:30
Maheshwar Ajja
b0bb16ebe7 ARM: dts: msm: Set max non secure region to 0xE0000000 on msm8998
Video hardware on msm8998 chipset limits the max non secure region
address to 0xE0000000. So reduce non secure region size to 0x6f800000
from 0x8f800000 to limit the max address to 0xE0000000.

CRs-Fixed: 1092881
Change-Id: Ib9602aa2298caf01ab01b4e0225c112c71bb81f4
Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>
2016-11-30 18:40:11 -08:00