Commit graph

589575 commits

Author SHA1 Message Date
Linux Build Service Account
9a95bce25c Merge "input: stm: Fix NULL dereference in laser driver" 2017-05-11 06:48:08 -07:00
Linux Build Service Account
590cfee905 Merge "msm: camera: Fixing NULL dereference in sensor code" 2017-05-11 06:48:06 -07:00
Linux Build Service Account
9fa70208d4 Merge "ARM: dts: msm: Add support for camss throttle clock on SDM660" 2017-05-11 06:48:05 -07:00
Linux Build Service Account
3757478deb Merge "msm: isp: Fix pdaf buffer drop" 2017-05-11 06:48:04 -07:00
Linux Build Service Account
5633ac9b6c Merge "msm: camera: Do not pass kptr in copy_from_user" 2017-05-11 06:48:03 -07:00
Linux Build Service Account
6ce7c8ebb5 Merge "msm: isp: Fix isp recovery mechanism" 2017-05-11 06:48:02 -07:00
Linux Build Service Account
a81797adfc Merge "msm: isp: Correct UB size for RDI" 2017-05-11 06:48:01 -07:00
Linux Build Service Account
3c272a1622 Merge "msm: camera: isp: Vote for bandwidth to avoid race condition" 2017-05-11 06:48:00 -07:00
Linux Build Service Account
1e059e00bf Merge "ARM: dts: msm: Add iris support on msm8998 and sdm660" 2017-05-11 06:47:58 -07:00
Linux Build Service Account
d598874f03 Merge "drivers: nfc: make nq-nci probe as async probe" 2017-05-11 06:47:55 -07:00
Linux Build Service Account
a71b4b38b9 Merge "ASoC: wsa881x-analog: make probe as async probes" 2017-05-11 06:47:54 -07:00
Linux Build Service Account
0690e9e093 Merge "ASoC: wsa881x-analog: fix overwrite of client->dev->driver_data" 2017-05-11 06:47:52 -07:00
Linux Build Service Account
67f2c6d9c8 Merge "mmc: sdhci-msm: make probe as async probe" 2017-05-11 06:47:50 -07:00
Linux Build Service Account
3a360dc173 Merge "drm/msm/sde: avoid adding plane states in crtc atomic check" 2017-05-10 23:04:06 -07:00
Linux Build Service Account
e1fb82e224 Merge "defconfig: msmcortex: Disable CONFIG_FORCE_ALLOC_FROM_DMA_ZONE" 2017-05-10 23:04:05 -07:00
Linux Build Service Account
97f9e94154 Merge "icnss_utils: replace mutex lock by spinlock" 2017-05-10 23:04:04 -07:00
Linux Build Service Account
bdd32e7afc Merge "drm: add extern C guard for the UAPI headers" 2017-05-10 23:04:03 -07:00
Linux Build Service Account
3930cf3fa7 Merge "msm: ipa: support aggregated ipa stats query" 2017-05-10 23:04:02 -07:00
Linux Build Service Account
95836aa032 Merge "msm: ADSPRPC: close glink channel before opening again" 2017-05-10 23:04:01 -07:00
Linux Build Service Account
8e831a70d3 Merge "usb: gadget: f_mtp: Handle OS descriptors properly" 2017-05-10 23:04:00 -07:00
Linux Build Service Account
05eae98b38 Merge "drm/msm/sde: move topology name reset to release resources" 2017-05-10 23:03:59 -07:00
Linux Build Service Account
df2fff8d1d Merge "ASoC: msm: qdsp6v2: Add TrueHD to compressed open" 2017-05-10 23:03:58 -07:00
Linux Build Service Account
abb1d6bee6 Merge "drm/msm: notify hpd status when audio codec is ready" 2017-05-10 23:03:56 -07:00
Linux Build Service Account
4952fa0037 Merge "defconfig: msm: Enable CNSS_ASYNC for auto platform" 2017-05-10 23:03:55 -07:00
Linux Build Service Account
00ddc986bb Merge "msm: mdss: fix null pointer dereferencing" 2017-05-10 23:03:53 -07:00
Linux Build Service Account
69f3e161f1 Merge "msm: mdss: set HDMI max TMDS clock rate" 2017-05-10 23:03:52 -07:00
Linux Build Service Account
45fd2409da Merge "ARM64: config: msm: Adding perf defconfig for mediabox" 2017-05-10 23:03:51 -07:00
Linux Build Service Account
9217ca30cc Merge "net: wireless: Fix regdb for 60G band" 2017-05-10 23:03:51 -07:00
Linux Build Service Account
2e2122879c Merge "defconfig: msm: Enable OnSemi regulator driver for msm8996-auto" 2017-05-10 23:03:50 -07:00
Linux Build Service Account
1b96a3f87a Merge "wil6210: fix array out of bounds access in pmc" 2017-05-10 23:03:47 -07:00
Linux Build Service Account
04433d45e2 Merge "wil6210: fix check for sparrow D0 FW file" 2017-05-10 23:03:46 -07:00
Linux Build Service Account
e566d8711d Merge "wil6210: support 8KB RX buffers" 2017-05-10 23:03:46 -07:00
Linux Build Service Account
8e3cba5f68 Merge "scsi: ufs: Add states to debug abnormal clocks turn off" 2017-05-10 23:03:45 -07:00
Linux Build Service Account
277412a0e7 Merge "input: misc: fix error path for hbtp touch screen driver" 2017-05-10 23:03:43 -07:00
Linux Build Service Account
a8b420d53b Merge "power: qpnp-fg-gen3: Disable ESR pulldown for debug battery id" 2017-05-10 23:03:43 -07:00
Linux Build Service Account
af1b766297 Merge "msm: ipa: apply reset wa to GPI channels" 2017-05-10 23:03:42 -07:00
Linux Build Service Account
b2754d1d5b Merge "memshare: Add guard bytes to avoid access issues" 2017-05-10 23:03:41 -07:00
Linux Build Service Account
c576a654b9 Merge "diag: dci: Add protection while querying event status" 2017-05-10 23:03:40 -07:00
Linux Build Service Account
bf1ff6fce1 Merge "ASoC: msm: qdsp6v2: clear address on error" 2017-05-10 23:03:38 -07:00
Linux Build Service Account
d575147a75 Merge "ASoC: msm: enhance ADSP Stream Callback" 2017-05-10 23:03:37 -07:00
Linux Build Service Account
4cb291c99a Merge "ASoC: msm: qdspv2: Add mixer controls for drift query" 2017-05-10 23:03:35 -07:00
Linux Build Service Account
3e3619c81e Merge "ARM: dts: msm: Add GPU speed bin 2 support for MSM8996Pro" 2017-05-10 23:03:34 -07:00
Linux Build Service Account
81c2642f71 Merge "Merge branch 'android-4.4@24ac44d' into branch 'msm-4.4'" 2017-05-10 23:03:33 -07:00
Clarence Ip
a198b6cdd1 drm/msm/sde: avoid adding plane states in crtc atomic check
This patch contains fixes to prevent the CRTC's atomic check
from inadvertently adding extra plane states to the current
state object.

CRs-Fixed: 2037970
Change-Id: Ic0b09ab369f77c2412ba7c3e63fe5032ef9bcd74
Signed-off-by: Clarence Ip <cip@codeaurora.org>
2017-05-10 14:56:26 -07:00
Emil Velikov
ccbadce56c drm: add extern C guard for the UAPI headers
CRs-Fixed: 2038080
Change-Id: Id6f4ac3d41fec4804b1449f303d4872bf7a1fd51
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Git-commit: ebbb0e5cfd2ceb1150b1af7f9fcf7aeebfb1b69f
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ebbb0e5cf
Signed-off-by: Manoj Kumar AVM <manojavm@codeaurora.org>
2017-05-10 14:12:36 -07:00
Daniel Vetter
bacaebb736 drm: Make drm.h uapi header safe for C++
virtual is a protected keyword in C++ and can't be used at all. Ugh.

This aligns the kernel versions of the drm headers with the ones in
libdrm.

v2: Also annote with __user, as request by Emil&Ilia.

CRs-Fixed: 2038080
Change-Id: I184b99e51fc5c6efd4eb6f5ed9da2858b7972a6e
Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1459350753-18320-1-git-send-email-daniel.vetter@ffwll.ch
Git-commit: 4c4925fa0c2b5943655ef28b2d6a379961db551f
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4c4925f
Signed-off-by: Manoj Kumar AVM <manojavm@codeaurora.org>
2017-05-10 13:20:38 -07:00
Yuanyuan Liu
43515e202c icnss_utils: replace mutex lock by spinlock
Replace mutex lock by spinlock in icnss_wlan_set_dfs_nol
as dfs module may call this function in timer context
which will result apps crash.

CRs-Fixed: 2044689
Change-Id: Ib820589cd8b120a39536aab69d6954ba8cc35e3c
Signed-off-by: Arif Hussain <arifhussain@codeaurora.org>
Signed-off-by: Yuanyuan Liu <yuanliu@codeaurora.org>
2017-05-10 11:43:52 -07:00
Ben Romberger
4d021085de ASoC: msm: qdsp6v2: Add TrueHD to compressed open
Add TrueHD format selection to ASM compressed
open and remove it from non-compressed open.

Change-Id: I94b61958e71d3a0d3aec2aa0206cf35698399d34
Signed-off-by: Ben Romberger <bromberg@codeaurora.org>
2017-05-09 23:44:00 -07:00
Tharun Kumar Merugu
5a15915855 msm: ADSPRPC: close glink channel before opening again
Added proper checks to avoid opening a glink channel before
completely closing previously opened channel.

Change-Id: Iaa41f4b27a80967b634dd832cc6ad060ea083b18
Acked-by: Viswanatham Paduchuri <vpaduchu@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-05-09 23:05:44 -07:00
Lloyd Atkinson
aeb83d7d6e drm/msm/sde: move topology name reset to release resources
Simplify the clearing of the topology name by moving it directly
to the release resources call.

Change-Id: If1926372b276f01f64138691b805493d1894951a
Signed-off-by: Lloyd Atkinson <latkinso@codeaurora.org>
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-05-09 19:14:02 -07:00