Commit graph

580464 commits

Author SHA1 Message Date
Linux Build Service Account
dc35156500 Merge "mdss: display-port: add support for multiple resolutions" 2016-12-30 06:27:59 -08:00
Linux Build Service Account
c6a73c839c Merge "msm: mdss: dp: fix compilation issues for 32-bit architectures" 2016-12-30 06:27:58 -08:00
Linux Build Service Account
3f317425d6 Merge "msm: mdss: dp: add support for downstream device power management" 2016-12-30 06:27:56 -08:00
Linux Build Service Account
36d9d0f8f4 Merge "msm: mdss: change retire fence signaling" 2016-12-30 06:27:55 -08:00
Linux Build Service Account
a14e665af6 Merge "diag: Fix error response during SSR" 2016-12-30 06:27:50 -08:00
Linux Build Service Account
62d89e4169 Merge "clk: qcom: clk-rcg2: Configure the RCGs to a safe frequency as needed" 2016-12-30 06:27:49 -08:00
Linux Build Service Account
6bfadc2729 Merge "soc: qcom: Increase length of crash reason smem buffer" 2016-12-30 06:27:45 -08:00
Linux Build Service Account
ef3248e7e4 Merge "wil6210: Protect against false interrupt during reset sequence" 2016-12-30 06:27:45 -08:00
Linux Build Service Account
c6b0a5297e Merge "spss_utils: add support to read debug regs" 2016-12-30 06:27:44 -08:00
Linux Build Service Account
55308e0dfe Merge "ASoC: wcd9335: Fix compander disable after SSR" 2016-12-30 06:27:43 -08:00
Linux Build Service Account
7169f0da4c Merge "ASoC: soc: msm: initialize buffer to prevent kernel data leakage" 2016-12-30 06:27:42 -08:00
Linux Build Service Account
607d1303c3 Merge "ASoC: msm-lsm-client: cleanup ioctl functions" 2016-12-30 06:27:41 -08:00
Linux Build Service Account
e8cece702f Merge "ASoC: wcd9335: Fix out of bounds for mad input value" 2016-12-30 06:27:40 -08:00
Linux Build Service Account
50f15acb6f Merge "ASoC: wcd9330: Fix out of bounds for mad input value" 2016-12-30 06:27:40 -08:00
Linux Build Service Account
9a111b700b Merge "uapi/media: add buffer size calculation for P010 ubwc" 2016-12-30 06:27:39 -08:00
Linux Build Service Account
ba7a68eca2 Merge "msm: ipa: fix the potential heap overflow on wan-driver" 2016-12-30 06:27:36 -08:00
Linux Build Service Account
8f4fb8ae38 Merge "net: ipc_router: Register services only on client port" 2016-12-30 06:27:32 -08:00
Linux Build Service Account
3a0a78d5f0 Merge "msm: camera: cpp: Add validation for v4l2 ioctl arguments" 2016-12-30 06:27:31 -08:00
Linux Build Service Account
4662d1f057 Merge "wil6210: align to latest auto generated wmi.h" 2016-12-30 06:27:27 -08:00
Linux Build Service Account
1fd3851fcd Merge "msm: mink: Send full buffer size to TZ for smcinvoke" 2016-12-30 06:27:26 -08:00
Linux Build Service Account
11d76c0a2e Merge "soc: qcom: flush persistent kmaps and fixmap mappings for subsystem mdt" 2016-12-30 06:27:26 -08:00
Linux Build Service Account
5e8d18d9d8 Merge "msm: ipa3: Suspend Q6 pipes again during SSR POST_SHUTDOWN" 2016-12-30 06:27:22 -08:00
Linux Build Service Account
31a6ac888a Merge "ARM: dts: msm: Update GPIO pins for SPI on msm8998" 2016-12-30 06:27:21 -08:00
Linux Build Service Account
6632411c41 Merge "memshare: Listen to SUBSYS_BEFORE_POWERUP to collect ramdump" 2016-12-30 06:27:21 -08:00
Linux Build Service Account
6b0941734f Merge "ice: fix security issue with validating error in pointer" 2016-12-30 06:27:20 -08:00
Linux Build Service Account
5ca83f1576 Merge "diag: Add sysfs parameter to control diag mask clear" 2016-12-30 06:27:19 -08:00
Linux Build Service Account
fa8941a548 Merge "Revert "msm: camera: isp: Update burst length for msmfalcon"" 2016-12-30 06:27:18 -08:00
Linux Build Service Account
5a79a9f21b Merge "msm: sensor: validating the flash initialization parameters" 2016-12-30 06:27:17 -08:00
Linux Build Service Account
592cd2ede1 Merge "msm: camera: fd: Fix race condition during stream-off" 2016-12-30 06:27:17 -08:00
Linux Build Service Account
d3b2123d2c Merge "ARM: dts: msm: Remove unrequired vbif settings" 2016-12-30 06:27:16 -08:00
Linux Build Service Account
fd194c107b Merge "coresight: stm: Remove spin lock usage for channel allocation" 2016-12-30 06:27:15 -08:00
Greg Kroah-Hartman
4155d3a923 staging: android: ion: fix up file mode
An older accidentally changed this to executable, so fix it back up.

Gotta love windows editors...

Change-Id: I6a142f3506dcccdb35f56e8e27fe7706321882ac
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit: f75baf8d90bf45221694a1a5f0e5acdcb3245760
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Shiraz Hashim <shashim@codeaurora.org>
2016-12-30 05:12:36 -08:00
Sayali Lokhande
e84e74427e defconfig: msm: Enable CONFIG_MMC_CQ_HCI for sdm660
Enable CONFIG_MMC_CQ_HCI to support command queue
mode for sdm660.

Change-Id: I72d1ae5a743e1fa7b171e9556cbf261321a0fa87
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2016-12-30 15:51:48 +05:30
Sayali Lokhande
5993c66bda ARM: dts: msm: Enable sdhc2 for sdm660
Add sdhc2 support to enable sdcard for
sdm660.

Change-Id: I7038590135bef2981735156a18c3104b0fc9f709
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2016-12-30 15:46:08 +05:30
Sayali Lokhande
a0130eccd3 ARM: dts: msm: Add sdhc1 for sdm660 MTP/CDP
Add sdhc1 to support eMMC for sdm660 mtp and
cdp platforms. Also add some missing device
properties for sdm660 simulator and rumi platforms.

Change-Id: I4bea35ebea8e710d82724a3d5098d952b71875f4
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2016-12-30 15:41:41 +05:30
Pavankumar Kondeti
f67dcbea7f sched: Fix deadlock between cpu hotplug and upmigrate change
There is a circular dependency between cpu_hotplug.lock and
HMP scheduler policy mutex. Prevent this by enforcing the
same lock order.

Here CPU0 and CPU4 are governed by different cpufreq policies.

----------------                        --------------------
    CPU 0                                          CPU 4
---------------                         --------------------

proc_sys_call_handler()                 cpu_up()

                                        --> acquired cpu_hotplug.lock

sched_hmp_proc_update_handler()         cpufreq_cpu_callback()

--> acquired policy_mutex

                                        cpufreq_governor_interactive()

get_online_cpus()                       sched_set_window()

--> waiting for cpu_hotplug.lock        --> waiting for policy_mutex

Change-Id: I39efc394f4f00815b72adc975021fdb16fe6e30a
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2016-12-30 12:31:01 +05:30
Amit Nischal
9e3ba4ae70 clk: Fix handoff counts for parent of handoff enabled clocks
For commit 44aa223a3e ("clk: move check for CLK_ENABLE_HAND_OFF at
unused tree") at unused tree level, prepare and enable counts are
only decrementing for handoff enabled clock(having CLK_ENABLE_HAND_OFF
flag) and counts are not decrementing for their parent clock.
So fixing the same by adding clk_core_unprepare/disable at unused tree
level for handoff enabled clocks so that parent handoff counts also
gets decrement.

Change-Id: Ib238540b2addbe8c9ff7f2e34428169c76e3f44b
Signed-off-by: Amit Nischal <anischal@codeaurora.org>
2016-12-30 11:50:40 +05:30
Kiran Gunda
3f384542db regulator: qpnp-labibb: Add support for PM660A
Modify the driver to support the new lab/ibb
hardware changes supported on PM660A.

New hardware supports the following features:
1) Smart pulse skip mode
2) LDO mode for LAB
3) PFM mode
4) PBS sequencer handling SWIRE decoding
5) Default output voltage configuration

Change-Id: I5461995cc0ac930dd354c63b97223085306e869d
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2016-12-30 10:24:54 +05:30
Alan Kwong
a3d3c7f534 msm: sde: correct polling to use software timestamp
In polling mode, driver is using the top level busy and
error status for completion check. This is not correct
for regdma because it has separate status register and
software timestamp. This patch corrects regdma to wait
for the appropriate status register and checks for software
timestamp for timeout.

CRs-Fixed: 1096834
Change-Id: I18f8ab14be1db4d24954115b763e6ac749b71b4d
Signed-off-by: Alan Kwong <akwong@codeaurora.org>
2016-12-29 10:23:07 -08:00
Adrian Salido
450a697713 msm: mdss: change retire fence signaling
Signal retire fence on first vsync after frame has been programmed to
hardware. This indicates when the frame starts being fetched by
MDSS hardware.

CRs-Fixed: 1081525
Change-Id: Ib69f64ff17a1609b67ff34ef277f658bfa5cfb5a
Signed-off-by: Adrian Salido <salidoa@google.com>
(cherry picked from commit 80d5d7558ac98c56527cb1040dab3fc5f438ab51)
Signed-off-by: Abhijit Kulkarni <kabhijit@codeaurora.org>
2016-12-29 10:14:14 -08:00
Naseer Ahmed
acb7e2f792 mdss: Do not wait for kickoff in display commit
Just wait for the display to idle instead and immediately start
the next commit. This reduces the depth of the commit pending
queue.

CRs-Fixed: 1081525
Change-Id: Ic4ee6f738f5fa77890e806b55d9a0304915761ea
Signed-off-by: Naseer Ahmed <naseer@codeaurora.org>
Signed-off-by: Abhijit Kulkarni <kabhijit@codeaurora.org>
2016-12-29 10:14:02 -08:00
Ashish Garg
3778f623f8 ARM: dts: msm: add support for truly panel in dsc mode
Add required panel sequences and timings for command mode
and video mode 2k truly panel in dsc compression mode.

Change-Id: I81eed3495f8be633d2b3fd92d63cd280fce7b4f0
Signed-off-by: Ashish Garg <ashigarg@codeaurora.org>
2016-12-29 16:24:35 +05:30
Tirupathi Reddy
421bb32449 ARM: dts: msm: Add GFX CPR device configuration for sdm660
GPU subsystem in sdm660 is supplied by either LDO300(VDD_GFX) in
LDO mode or VDD_CX in BHS mode. This LDO300 is CPR managed and supports
CPR closed-loop operation. Add CPR device node with required configuration
for supporting CPR closed-loop operation for sdm660.

CRs-Fixed: 1068294
Change-Id: Id12a50563f6cef196ef76816fcf8e177b9a3fa97
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
2016-12-29 16:16:37 +05:30
Neeraj Upadhyay
98a47a0419 msm: Back merge rel to dev for SDM660/SDM630 renaming
Change-Id: Idd3880bb1570fac9a6f4f4008a1ca48384f8e3a4
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
2016-12-29 15:35:28 +05:30
Manoj Prabhu B
ec046f26dd memshare: Fix possible memory leak
This patch frees up the dynamically allotted memory
when met with error condition and function return.

CRs-Fixed: 1106180
Change-Id: I01446fbdbb422dcb025ee50929b32f40a5a78681
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2016-12-29 14:56:32 +05:30
Avaneesh Kumar Dwivedi
1904958951 soc: qcom: Increase length of crash reason smem buffer
Presently we read a length of 80 character to dump subsystem
crash reason in case of err fatal on subsystem. Making it 130
character to dump additional info provided by subsystem.

CRs-Fixed: 1083000
Change-Id: Icaf4c27862984148c7125332ef7531b2a61f4ea2
Signed-off-by: Avaneesh Kumar Dwivedi <akdwived@codeaurora.org>
2016-12-28 23:22:20 -08:00
Manoj Prabhu B
e145621a4a diag: Fix error response during SSR
This patch addresses the scheduling conflicts of
control channel removal work by listening
to peripheral events.

CRs-Fixed: 1081265
Change-Id: Ib9f2448e564c4800535bd80d13c9bda5cc283c3c
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2016-12-29 12:51:16 +05:30
Deepak Katragadda
87c6bb6b8b clk: qcom: clk-rcg2: Configure the RCGs to a safe frequency as needed
In certain cases, an RCG might be prone to being enabled even
though the overlying software thinks that it disabled the RCG.
In order to avoid letting the RCG go into an invalid state, support
parking it at a safe frequency during clk_disable() and deferring
all the RCG configuration updates to be done during clk_enable(),
if a scaling request comes in whilst the clock is disabled.

Change-Id: I55f1d1d346182a2b480127c57d6659fc9a63331b
Signed-off-by: Deepak Katragadda <dkatraga@codeaurora.org>
2016-12-28 22:56:12 -08:00
Rohit Kulkarni
2eb05c86d3 uapi/media: add buffer size calculation for P010 ubwc
Add support for P010 ubwc format in media buffer size
calculation API.

Change-Id: I3e99bb37ff3353b77dc1aa892ca017a7af28ec00
Signed-off-by: Rohit Kulkarni <rkulkarn@codeaurora.org>
2016-12-28 13:11:17 -08:00
Neeraj Upadhyay
33eba0ae11 msm: Rename msmtriton/apqtriton to sdm630/sda630
Update the code name from msmtriton/apqtriton to sdm630/sda630.
As part of this, update the filename containing "triton" and
files content containing "triton".

Change-Id: Ia558be75041e41e83d304d5fb4091c2a098e87c0
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
2016-12-28 21:56:22 +05:30