Merge "Merge "Merge "csdio: Remove the driver"""
Merge "Merge "csdio: Remove the driver""
Merge "Merge "Merge "csdio: Remove the driver"""
Merge "Merge "csdio: Remove the driver""
Merge "Merge "Merge "csdio: Remove the driver"""
Merge "Merge "csdio: Remove the driver""
Merge "Merge "Merge "csdio: Remove the driver"""
Merge "Merge "csdio: Remove the driver""
Revert "Update on Program TILE video frame size in dma ISR."

This reverts commit 88ac781cec1034301882099f1f11984b73831d92.

Change-Id: Idecc76ededc625d77ae3c8fd3f9e0da512b4848f
Signed-off-by: raghavendra ambadas <rambad@codeaurora.org>
Revert "msm_fb: display: update video tile framesize register"

This reverts commit 80f8dfbbbb20adde0fc0c164c19bd5ea50c2ddf1.

Change-Id: I1270e0296808a53e5a2559c19526cec67b5dbc33
Signed-off-by: raghavendra ambadas <rambad@codeaurora.org>
Revert "msm_fb: display: Program TILE video frame size in dma ISR"

This reverts commit 472d090f0b745f09d515b81961291971996b6fd3.

Change-Id: Ic38c8d634cec7200df58dcf108b4f37b4fe06f70
Signed-off-by: raghavendra ambadas <rambad@codeaurora.org>
msm: kgsl: Protect against a potential overflow in kgsl_sg_alloc

Avoid allocating a scatterlist so large that it overflows the size
passed to the memory allocators.

CRs-fixed: 564448
Change-Id: Ic0dedbad2ab421ddec8f3be38d61c9bdf9ae5bd4
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
msm: kgsl: avoid zero length scatterlist allocation

During sglist allocation we calculate sglen as
per below

sglen_alloc = PAGE_ALIGN(size) >> PAGE_SHIFT;

sglen_alloc can be zero if size falls within the
last page. For example, when size = 0xFFFF_FF7B,
PAGE_ALIGN(0xFFFF_FF7B) will be 0, considering
0x1000 (4kb) PAGE_SIZE. if kzalloc() with
zero size, it will return ZERO_SIZE_PTR which is
not NULL and we always do NULL check. Dereferencing
ZERO_SIZE_PTR will lead to a distinct access fault.

Signed-off-by: Gaurav Gagrani <ggagrani@codeaurora.org>

Change-Id: Ibcc6198438c13b5111be0faa736328db92511597
CRs-Fixed: 563106
Signed-off-by: Prakash Kamliya <pkamliya@codeaurora.org>
Merge "Merge "Merge "csdio: Remove the driver"""
Merge "msm: camera: Make AXI stop/abort/reset and overflow recovery mutually exclusive."
Merge "msm: rpm: do not disable the interupt during suspend"
Merge "msm: kgsl: Add a missing refcount put for kgsl_context"
Revert "defconfig: remove support for /dev/mem and /dev/kmem on perf builds"

This reverts commit 938693a9cfb7756fc12851134100691872e55ca6.

Change-Id: I0086d98b5632f295b00b0537616cdbfbd1aa8640
Signed-off-by: Prados Das <prados@codeaurora.org>
Merge "netfilter: x_tables: fix ordering of jumpstack allocation and table update"
Merge "Revert "Update on Program TILE video frame size in dma ISR.""