scripts: Don't add plus sign to kernel version
msm: vidc: Avoid memset of list elements in the buffer entry.

- Due to race condition between free buffer and flush output buffers,
  invalid buffer is getting accessed sometimes.
- Reset all the members in buffer entry except list elements.

(cherry picked from commit 8105df366cf6b9f1ddbc15d561fb6a5f12540416)

Change-Id: I124344f62b973d60d382e6eef7d7888b1320c124
CRs-Fixed: 411197
Signed-off-by: Srinu Gorle <sgorle@codeaurora.org>
msm: kgsl: Set requested power state to NONE after resume

When GPU resumes from suspend requested state is not cleared to NONE.
Due to this idle reporting is not done and GPU stays at MAX freq. As
a fix if the current power state is already ACTIVE and request is
made for active power state then clear the requested state immediately.

CRs-fixed: 424682
Change-Id: I7f0d7fa819308f166cbbbf30b2c20aee73644cfb
Signed-off-by: Vinay Roy <vroy@codeaurora.org>
lib: genalloc: Change chunk allocation to vmalloc

Change the chunk allocation from kmalloc to vmalloc for
allocations greater than a page. This allows large
chunks to be allocated from physically non-contiguous
memory and increases the chance of the allocation
succeeding.

(cherry picked from commit 0614b96dc8e4c8a0dd0db41aec5a79daa3bdf091)

Conflicts:

	lib/genalloc.c

(cherry picked from commit 64cf7183f37df623bec8f46348b11c5781d3b0cc)

Change-Id: Ied97c888b967c4433519cb47e972f7a0f2281d71
CRs-fixed: 387655
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
net: wireless: bcm4329: Various updates from AOSP
Revert "net: wireless: bcm4329: Various updates from AOSP"

This reverts commit 9868d22ada0c677c79535f6033f42672d850a6a2.
msm_fb: display: Avoid MDP for backend compostion during BLT enable.

If MDP_BACKEND_COMPOSITION is set and blt mode is enabled,
fall-back to GPU to avoid underruns.

CRs-Fixed: 373516
Change-Id: I9ae3aae59ee6a02a5b86a5f83a2d499ddf7687b7
Signed-off-by: Mayank Chopra <makchopra@codeaurora.org>
msm_fb: Display: Fix Dithering issue for rgb565 format

Using RGB888 as source format and rgb565 as destination pixel format,
will cause image corruption on the display. Fix this issue by
setting the destination format as RGB888 in MDP and DSI controller
pixel format as RGB565 for DSI specific panels.

CRs-Fixed: 377484
Change-Id: If58976ee9cd4825efb39437170e54796fa2213e0
Signed-off-by: Chandan Uddaraju <chandanu@codeaurora.org>
(cherry picked from commit 2a811f2a333ca0507eb98c35831af463f43fb011)

Signed-off-by: Dhivya Subramanian <dthiru@codeaurora.org>
msm_fb: display: Flush background pipe after solid fill configuration

For is_fg support on a foreground pipe, the  background pipe is
currently set to Solid Fill mode without being flushed. Add flush
after enabling Solid Fill on background pipe.

CRs-fixed: 352855
Change-Id: I91c4e391c9577a9198d048d2b369369d348efeab
Signed-off-by: Amara Venkata Mastan Manoj Kumar <manojavm@codeaurora.org>
msm_fb: display: Free staged foreground pipes during suspend

During suspend, some foreground pipes might still be staged and
have to be removed before disabling timing generator.
So, these pipes are staged down and freed before timing generator
is switched off.

Change-Id: I3f2376cac43464c64cd1c9e2f16f3d801298c25d
Signed-off-by: Ravishangar Kalyanam <rkalya@codeaurora.org>
msm_fb: display: add out of range check for display sizes

MDP pipe or mixer size registers have 12-bit number, so boundary
checks are needed for those parameters. If not, input req sizes could
be very large 32 bit unsigned numbers, e.g. 0xffffffff, unsigned
operations may have overflow to pass all later checks, causing MDP
underruns or hang issues.

(cherry picked from commit 53156f5794a1eb8625033cabe243bf35bde93d1f)

Change-Id: I26a309879bcad20737e2f78ae1fde81ff6c12435
CRs-fixed: 380469
Signed-off-by: Huaibin Yang <huaibiny@codeaurora.org>
Initial Support for BLN (taken from aries kernel)
Touchkey: don't disable touchkey if there's a BLN active
vidc: 1080p : Add support for slice delivery mode to encoder

    Slice delivery mode enables confguring the encoder to deliver
    one slice per output buffer. This mode is valid only for h264
    codec when multi slice config is set to slice by mb.

Credits: Pradnya Chaphekar <pradnyac@codeaurora.org>
vidc: 1080p : Add support for skip frame in slice delivery mode

    Slice delivery mode for H264 encoder will deliver constant number of
    output slice buffers for each frame. In case of CBR rate control method,
    core will skip frames to maintain the output quality, in which case
    driver need to send out the output buffers with data length as zero
    for skipped frame output type from the core.

Credits: Maheshwar Ajja <majja@codeaurora.org>
Reset PMEM_SF_SIZE to stock one
Revert "Reset PMEM_SF_SIZE to stock one"

This reverts commit 0b203e38d9fc42e04c63b53d1e5ae8029c15f462.
Cypress-touchkey: add wakelock for avoid suspend when bln is active!
Fix bln wake_locks!
VOIP Patch for ariesve!