msm: vidc: fix allocation issue with secure buffers

- Set buffer types properly in prepare_buf for encoder

Change-Id: If507596954562e3066a6bd9fbb81518da1dcc696
Signed-off-by: Cullum Baldwin <cullumb@codeaurora.org>
Merge "msm: vidc: fix allocation issue with secure buffers"
mm: compaction: fix bit ranges in {get,clear,set}_pageblock_skip()

{get,clear,set}_pageblock_skip() use incorrect bit ranges (please compare
to bit ranges used by {get,set}_pageblock_flags() used for migration
types) and can overwrite pageblock migratetype of the next pageblock in
the bitmap.

Change-Id: I5e1dc0cf62fe681d332b86a6cdfacb838d6e0415
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Mel Gorman <mgorman@suse.de>
Tested-by: Thierry Reding <thierry.reding@avionic-design.de>
Acked-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Git-commit: 627260595ca6abcb16d68a3732bac6b547e112d6
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Merge "mm: compaction: fix bit ranges in {get,clear,set}_pageblock_skip()"
kernel : Removing Android related configs from the MSM8974.

Change-Id: I4d1938995b0e885908bb6a8cb4139dda72b69f92
Signed-off-by: Yogesh Lal <ylal@codeaurora.org>
msm: mdss: Add runtime writeback output format configuration

Set writeback output format using metadata_ioctl before
queuing buffer for write back from mdp. Default output
format is VENUS. Writeback support RGB_565, RGB_888,
ARGB_8888, XRGB_888 and VENUS as output format.

Change-Id: I788b7f54d80a592ac8da07d10f6b292c4650e46c
Signed-off-by: Beeresh Gopal <gbeeresh@codeaurora.org>
ASoC: msm: Add support to query the channel map info

Implement method to get the channel map information from the
user space.
Remove the global variables in pcm driver to store the channel
map in the platform driver. This is needed to support multiple
instances of pcm driver for different pcm streams.

Change-Id: I9035db4e52f39b9d612312bafab4d22a28937f4b
Signed-off-by: Subhash Chandra Bose Naripeddy <snariped@codeaurora.org>
Signed-off-by: Ajit Singh Solanki <asolan@codeaurora.org>
Merge "msm: mdss: Add runtime writeback output format configuration"
driver core: fix possible missing of device probe

Inside bus_add_driver(), one device might be added(device_add()) into
the bus or probed which is triggered by deferred probe
just after completing of driver_attach() and before
'klist_add_tail(&priv->knode_bus, &bus->p->klist_drivers)',
so the device won't be probed by this driver.

This patch moves the below line

	'klist_add_tail(&priv->knode_bus, &bus->p->klist_drivers)'

before driver_attach() inside bus_add_driver() to fix the
problem.

CRs-Fixed: 495951
Change-Id: I9250b399d57a89870d1df220b97fdca275e2e1a9
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit: 190888ac01d059e38ffe77a2291d44cafa9016fb
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Sagar Dharia <sdharia@codeaurora.org>
msm: kgsl: Add caching support for DRM GEM allocations.

This change adds 3 KGSL DRM Ioctls.
DRM_IOCTL_KGSL_GEM_SET_USERDATA
DRM_IOCTL_KGSL_GEM_SET_USERDATA
DRM_IOCTL_KGSL_GEM_CACHE_OPS
Get and set userdata Ioctls is used by userspace to
store information like last operation (Read/Write) done
on this DRM object, last mapping (CPU/GPU) done for
this DRM object. This is require to optimize number of
cache operation on DRM GEM object.
DRM_IOCTL_KGSL_GEM_CACHE_OPS is used by userspace to
perform cache operation on DRM GEM object.

Change-Id: Id228a52da90cafed6a2b9e0b000117ad7aa8e366
Signed-off-by: Deepak Kumar <dkumar@codeaurora.org>
Merge commit 'AU_LINUX_ANDROID_JB_MR1_RB1.04.02.02.050.117' into 123

Conflicts:
	arch/arm/mach-msm/clock-8610.c
	drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c
	drivers/video/msm/mdss/mdss_mdp_overlay.c

Change-Id: I619152932a0628d713b030a61ca760a015f853e4
Signed-off-by: Abhinav Gurram <c_abhina@codeaurora.org>
msm: vidc: Fix bug in subsystem_get error handling

On failure, subsystem_put returns an error code. Video
driver should not mistake this error code with a valid handle.

Change-Id: Ibc13adda1b2a6b64b5ae0c1fd13c179678817233
Signed-off-by: Vinay Kalia <vkalia@codeaurora.org>
msm: mdss: Add support for BGRA and BGRX as writeback output format

Add support to get and set BGRA_8888 and BGRX_8888
as writeback output format using metadata_ioctl.

Change-Id: I093824229d09b89433aaceffe585fb2d3e2b9e10
Signed-off-by: Pawan Kumar <pavaku@codeaurora.org>
base: genlock: Correct the lock file reference count.

genlock_get_fd_handle API creates a new FD and attaches
it to lock file and shares this FD to second process.
Now, two file descriptor are pointing to same file.
If one FD is closed, lock file will be closed. This
changes add a extra reference to lock file as new FD
has been attached. Taking this reference will make sure
that file doesn't get close. This refrence will go when
client will call close on this FD.

Change-Id: I3524bed5ededd89d43ca6d8b85df11c85c03c1e3
Signed-off-by: Deepak Kumar <dkumar@codeaurora.org>
Merge "ASoC: msm: Add support to query the channel map info"
Merge "msm: vidc: Fix bug in subsystem_get error handling"
Merge "driver core: fix possible missing of device probe"
ASoC: msm: qdsp6v2: fix broken unmap memory regions

Current adm_memory_unmap_regions() does nothing since the packet size
was filled with zero.  This consequently fixes following memory map error
which was due to double memory mapping.

CRs-fixed: 491669, 487082
Change-Id: I1d1722fd5d10d1cfeb618e3329c84f4e2a71a477
Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org>
Merge "Merge commit 'AU_LINUX_ANDROID_JB_MR1_RB1.04.02.02.050.117' into 123"
Merge "msm: mdss: Add support for BGRA and BGRX as writeback output format"