Commit graph

589550 commits

Author SHA1 Message Date
Shantanu Jain
c7ac4db6b5 input: misc: fix error path for hbtp touch driver
Fix error path for hbtp touch driver where error
variable is not given proper error code while bailing
out from the function.

Change-Id: I56e2654ecffb021a60dd07ea5b5afe45a70a1c85
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
2017-05-11 03:52: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
Wei Li
6b444311da defconfig: msm: Enable CNSS_ASYNC for auto platform
This option allow CNSS platform driver to use asynchronous
probe for auto platform.

Change-Id: I54c997be995e3fb660779a18fd848dcbc325c49a
Signed-off-by: Wei Li <weili@codeaurora.org>
2017-05-09 18:47:04 -07:00
Wei Li
3e16478810 cnss: add an option to allow driver using asynchronous probe
Add option CONFIG_CNSS_ASYNC to allow CNSS platform driver probe
asynchronously for boot time optimization in auto platform

Change-Id: Id1fcb8991a47ae56098a9bbd6ff570e22d6450d6
Signed-off-by: Wei Li <weili@codeaurora.org>
2017-05-09 18:46:52 -07:00
Abhinav Kumar
7830abef6e drm/msm: allow SDE HDMI display to support 4K
SDE HDMI driver capabilities were capped
to 1080P due to lack of dual pipe support in userspace.

Relax this restriction as full userspace support to
allow dual pipe support is now available.

Change-Id: If8242ea3c65a901ceb3e1004ac40b29ab8554c4b
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-05-09 17:55:46 -07:00
Mohit Khanna
89e74ed898 defconfig: msmcortex: Disable CONFIG_FORCE_ALLOC_FROM_DMA_ZONE
This flag is primarily being used for WLAN to support WLAN
hardware which cannot handle "> 32 bit" physical addresses for
DMA.

Disable this flag for the perf variant of msm8998. This flag forces DMA
addresses to be in 32 bit region. Using this flag with ihelium WLAN
solution (which can handle 64 bit physical DMA addresses) is causing a
reduction in peak KPIs for TCP RX.

Since kernel 4.4 is being used only by ihelium and not being used
for older versions of WLAN hardware (e.g. ROME), we can safely disable
this flag.

CRs-Fixed: 2044326
Change-Id: If2e7d4bab15f6211e91b1095a8ac6c2bf7e9000e
Signed-off-by: Mohit Khanna <mkhannaqca@codeaurora.org>
2017-05-09 16:02:03 -07:00
Hamad Kadmany
8bdcb4a51a net: wireless: Fix regdb for 60G band
60g frequency range and outdoor for EU updated.
Remove blanks lines as they must not be used.

Change-Id: I35395e8d770521514fc704aa71ccd5c74274b0ff
Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
2017-05-09 15:28:12 +03:00
Shadab Naseem
78caf61e9a ARM64: config: msm: Adding perf defconfig for mediabox
Adding perf defconfig for APQ8098 mediabox.
APQ8098 Display driver is moving away from Framebuffer (CONFIG_FB)
configuration to DRM (CONFIG_DRM) configuration and mediabox is using
ATH10k wlan driver.

Change-Id: I6f0b52a4beca9b3367d9fc52127aa57426685355
Signed-off-by: Shadab Naseem <snaseem@codeaurora.org>
2017-05-09 16:36:16 +05:30
Kiran Gunda
67661c1acc defconfig: msm: Enable OnSemi regulator driver for msm8996-auto
Enable OnSemi external buck regulator driver to provide
the supply for graphics rail on msm8996-auto board.

Change-Id: I0e7a37aca19fba94c17fb34c81753115b9fe6d7c
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-05-09 11:42:19 +05:30
Shantanu Jain
3ffb190bb8 input: misc: fix error path for hbtp touch screen driver
Fix error path for hbtp touch screen driver where error
variable is not initialized to a error value before bailing
out from the driver function.

Change-Id: Ife3376891950216971cafaf33fd8308697b7f904
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
2017-05-09 11:30:24 +05:30
Skylar Chang
896cdfb809 msm: ipa: support aggregated ipa stats query
add support on wan-driver to query modem or
wlan-fw to get the total data usage for all
tethered clients.

Change-Id: I56f40f1c0f6b2ec4279e78b3aeb81c687d08bf2e
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2017-05-08 15:13:55 -07:00
Skylar Chang
052b82d3e4 msm: ipa: apply reset wa to GPI channels
When resetting a GSI channel a special handling is needed
if there is an open aggregation frame. This handling is applied
to USB and MHI channels. This commit applies this handling to
GPI (system) channels as well.

Change-Id: Iebdf3d7375a4bd584c75503f01e64d7106f25e5a
CRs-Fixed: 2029089
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2017-05-08 09:46:18 -07:00
Ray Zhang
c74b2c0e58 drm/msm: notify hpd status when audio codec is ready
HDMI connector should wait for audio codec status and notify
HPD status only in case that audio codec has been registered
successfully. Meanwhile move HPD notification to bridge enable
and disable instead of hotplug work. This ensures the correct
video and audio sequence.

Change-Id: I0dac915c8639bb881265a608016e9d37ec9a153c
Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-05-08 15:09:41 +08:00
Mohit Aggarwal
2b612d1b72 memshare: Add guard bytes to avoid access issues
Currently, TZ is performing merging of resource groups
due to which NOC error is happening during access of
memory allocated to diag. This patch fixes the issue
by adding guard bytes so that merging of resource
groups will not happen.

CRs-Fixed: 2026525
Change-Id: I9829e5a07aef723c4261aa16dd5274cfeb1a75a3
Signed-off-by: Mohit Aggarwal <maggarwa@codeaurora.org>
2017-05-08 11:55:40 +05:30