Merge "cfg80211: Add AP stopped interface"
Merge "cfg80211: Reset beacon interval when stop AP fails"
msm: msm_fb: Replace wait for DMA_P with VSYNC in Pan_display Path.

This is a follow up change on gerrit 442946. Wait for DMA_P has to be
replaced with VSYNC even in Pan Display Path.

Change-Id: I8d600022cfa63f54d5b72ea5f64fc55315079b3a
Signed-off-by: Vishnuvardhan Prodduturi <vproddut@codeaurora.org>
Merge "msm: msm_fb: Replace wait for DMA_P with VSYNC in Pan_display Path."
msm: camera: Add debugfs support for VFE.

Add debugfs support in VFE driver and enable user to perform the
following actions at runtime thorugh debugfs:
- dump the VFE registers.
- print the VFE configuration.

Change-Id: Ib8641b3dde6a7b41c4d63631b6b8ed1bac374317
Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>
Config-8960: Disable Bluez dependant modules

Since MR2 comes with Bluedroid stack, disable Bluez dependant
modules from kernel.

CRs-Fixed: 542077
Change-Id: Ie2e1ef786c45d31b6705ddf1dd02eecfff2ba365
Signed-off-by: Juffin Alex Varghese <jalex@codeaurora.org>
msm: kgsl: Try fault tolerance even if there is no active context

No active context means that GPU could have failed when executing
commands that set an active context. In this case there are no bad
commands. This sort of hang can mostly be attributed to power
fluctuations or memory barriers which in all likelyhood can pass
after a reset. So treat no active context as a recoverable hang
scenario as well.

Change-Id: I0481a480bdb895f67daa2ed32df49eb1afe29029
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>
Signed-off-by: Ananta Kishore K <akollipa@codeaurora.org>
msm: kgsl: Remove drawctxt_active from setstate default

drawctxt_active is cleared after the old context is removed
during context switch.  Unfortunately, the context restore calls
adreno_use_default_setstate() which always returns true if
drawctxt_active is NULL, effectively always forcing us down the
software path.

Remove the check - adreno_use_default_setstate() already checks to see
if the GPU is idle and that is a more reliable verification that the
software path is worth going down.

Change-Id: Ic0dedbad57d7783bc23dd925a277a63cd2d78a7e
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
msm: kgsl: Fix the KGSL driver to compile when CONFIG_DEBUG_FS=n

Fix a compilation error when CONFIG_DEBUG_FS is disabled. Add an
initialization flag to the process struct rather than rely on a
pointer to the debugfs node which will always be NULL if debugfs
is not available.

CRs-fixed: 542231
Change-Id: Ic0dedbadf0241fd476e56d6e116a811697b38190
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Increase ION MMHeap from 56MB to 72MB

Increase ION MMHeap size from 56MB to 72MB to support
1080p widevine playback over 720p WFD session.
The Heap size is made a multiple of 4MB due to
CMA Alignment requirement.

Change-Id: I3dfed71a535c392441673f940bccfb6e87872958
Signed-off-by: Nirmal Abraham <nabrah@codeaurora.org>
Merge "msm_fb: display: Add support to YCBYCR MDP format"
Merge "msm: rotator: Add support to YCBYCR rotator format"
Merge "msm: camera: Add debugfs support for VFE."
Merge "Increase ION MMHeap from 56MB to 72MB"
Merge "defconfig: Enable NOTRACK target"
msm: vidc: Validate input data before processing

User controlled data needs to be validated before
processing, otherwise it may corrupt existing data
and other programming variables which may further
lead to crash in kernel space.
This change validates user specified buffer's data,
such as offset and data length, before performing
any operations in kernel.

Change-Id: Idb2a5c4c270cdbb55adfc0c22b9296b7dd359de9
CRs-fixed: 547695
Signed-off-by: Deepak Verma <dverma@codeaurora.org>
msm: kgsl: Handle failure of find_process_private()

Handle the case of NULL return from find_process_private() upon
its failure by failing from get_process_private().

CRs-fixed: 542831
Change-Id: I8a365368ecf68f0d1aa01199aca76bc7ac49e154
Signed-off-by: Harsh Vardhan Dwivedi <hdwivedi@codeaurora.org>
Merge "msm: vidc: Validate input data before processing"
Merge "diag: Change maximum size of error response"
Merge "msm-camera: Bound check num_cid from userspace in csid driver"