Merge "msm_fb: display: replace msleep with wait4vsync"
Conflicts:
	drivers/char/diag/diag_debugfs.c
	drivers/char/diag/diag_masks.c
	drivers/char/diag/diagchar_core.c
Merge "msm: display: panel frame rate report"
Conflicts:
	drivers/video/msm/msm_fb.c
	include/linux/msm_mdp.h
Merge "msm: display: panel frame rate report"
Conflicts:
	arch/arm/mach-msm/board-8960.c
	drivers/char/diag/diag_debugfs.c
	drivers/char/diag/diag_masks.c
	drivers/char/diag/diagchar_core.c
	drivers/media/video/msm_wfd/mdp-4-subdev.c
Merge "msm: display: maintain smmu for secure video"
Conflicts:
	drivers/char/diag/diag_debugfs.c
	drivers/char/diag/diag_masks.c
	drivers/char/diag/diagchar_core.c
msm_fb: display: add wfd suspend/resume to early suspend

wfd on/off was handled by fb_on/fb_close which are called from video
or userspace side. However, this is not the case for this branch. mdp
driver has to register wfd for suspend to make sure proper panel
on/off happen.

Change-Id: If1836598e5ae95e4b2b72e40dc85784a0d20c843
Signed-off-by: Huaibin Yang <huaibiny@codeaurora.org>
diag: Add support for mutiple HSIC instances

On a future target, applications processor will talk to
two MDMs simultaneously. This change will enable multiple
HSIC connections towards this configuration.

Change-Id: I2138b1d458936eddb8276a12e92916a4893d922b
Signed-off-by: Ravi Aravamudhan <aravamud@codeaurora.org>

Conflicts:
	drivers/char/diag/diag_debugfs.c
Merge "msm: kgsl: Ensure context pointer exists before dereferencing"
Conflicts:
	drivers/gpu/msm/adreno_ringbuffer.c
Merge "msm: kgsl: Ensure context pointer exists before dereferencing"
Conflicts:
	arch/arm/mach-msm/acpuclock-8930ab.c
	arch/arm/mach-msm/board-8960.c
	arch/arm/mach-msm/include/mach/usbdiag.h
	arch/arm/mach-msm/lge/mako/board-mako.c
	drivers/char/diag/diag_debugfs.c
	drivers/char/diag/diag_masks.c
	drivers/char/diag/diagchar.h
	drivers/char/diag/diagchar_core.c
	drivers/char/diag/diagfwd.c
	drivers/char/diag/diagfwd_bridge.c
	drivers/char/diag/diagfwd_bridge.h
	drivers/char/diag/diagfwd_hsic.c
	drivers/char/diag/diagfwd_hsic.h
	drivers/char/diag/diagmem.c
	drivers/char/diag/diagmem.h
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/media/video/msm_wfd/mdp-4-subdev.c
	drivers/video/msm/mdp.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_interrupt_handler.c
Merge "msm: kgsl: Fix guilty context logic for GPU hangs"
Conflicts:
	drivers/char/diag/diag_debugfs.c
	drivers/char/diag/diag_masks.c
	drivers/char/diag/diagchar_core.c
Merge "msm: kgsl: Don't wake up gpu on kgsl_ioctl calls if not necessary"
Conflicts:
	drivers/char/diag/diag_debugfs.c
	drivers/char/diag/diag_masks.c
	drivers/char/diag/diagchar_core.c
msm: display: increase fence timeout

Increase timeout value to 900ms to allow
gfx engine to render longer.
When sync_fence_wait fails, need not put fence as
it will be handled outside the loop.

Change-Id: Id4caff55c9f99c48e5f87a85d30fe4c8c0cd65e7
Signed-off-by: Ken Zhang <kenz@codeaurora.org>
msm: kgsl: Cleanup memdesc flags

We had a ugly mix of flags from usersapce mixed in with internal flags
and the flags were stored in priv and the internal flags were stored
in flags and general confusion all around.

So, external (user) flags moved to memdesc->flags, internal bits moved
to ->priv and now we are ready to handle the full onslaught of user
specified flags.

Change-Id: Ic0dedbad2236ae353b31e5dcaa6ff551713abaf1
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rajeev Kulkarni <krajeev@codeaurora.org>

Conflicts:
	drivers/gpu/msm/kgsl.c
	drivers/gpu/msm/kgsl.h
	drivers/gpu/msm/kgsl_debugfs.c
	drivers/gpu/msm/kgsl_mmu.c
	drivers/gpu/msm/kgsl_sharedmem.c
	drivers/gpu/msm/kgsl_sharedmem.h
	drivers/gpu/msm/kgsl_trace.h
msm: kgsl: Add GFP_NORETRY to the page_alloc flags and handle errors

The most important thing for the memory allocator is to not crash
or otherwise behave badly during low memory situations. Adding
GFP_NORETRY keeps the OOM killer from being invoked making the 32MB
padding on the allocation redundant.  Remove the padding, add the flags
and go down the proper error path when alloc_pages() fails.

Change-Id: Ic0dedbadaf86e248b372b22cd3a41a5dabedb82e
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>

Conflicts:
	drivers/gpu/msm/kgsl_sharedmem.c
msm: kgsl: Remove support for IOCTL_KGSL_SHAREDMEM_FROM_VMALLOC

All userspace consumers should now be using IOCTL_KGSL_GPUMEM_ALLOC,
so we can safely remove this kludgy and deprecated code.  The structs
and #defines are left in the header to avoid breaking userspace and
to serve as a reminder of the way we were, but any use of
IOCTL_KGSL_SHAREMEM_FROM_VMALLOC will return -ENOTTY.

Change-Id: Ic0dedbad1460acfe28116ee2dbd75faa52b76857
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
msm_fb: display: wait4vsync after timing generator is turned off

When continuous splash is enabled, timing generator is enabled at
bootloader, it then needs to be turned off at mdp4_dsi_video_on()
to switch displayed content from frame buffer. wait4vsync after
timing generator is turned off is necessary to make sure DMAP has
finished fetching splash logo from original splash buffer. Otherwise,
DMAP iommu page fault may happen.

Change-Id: I35f9fb9da76f93b60d4719d147aea3246c770c9f
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>

Conflicts:
	drivers/video/msm/mdp4_overlay_dsi_video.c
cfg80211: Add TDLS event to allow drivers to request operations

The NL80211_CMD_TDLS_OPER command was previously used only for userspace
request for the kernel code to perform TDLS operations. However, there
are also cases where the driver may need to request operations from
userspace, e.g., when using security on the AP path. Add a new cfg80211
function for generating a TDLS operation event for drivers to request a
new link to be set up (NL80211_TDLS_SETUP) or an existing link to be
torn down (NL80211_TDLS_TEARDOWN). Drivers can optionally use these
events, e.g., based on noticing data traffic being sent to a peer
station that is seen with good signal strength.

Change-Id: I778f5136fc4518bedcaed14a5412de4be6c85cf3
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Ng Chilam <chilamng@qca.qualcomm.com>
[Madan Mohan Koyyalamudi <mkoyya@codeaurora.org>: move changes from
include/uapi/linux/nl80211.h to include/linux/nl80211.h, remove trace.h,
remove trace_cfg80211_tdls_oper_request() in nl80211.c ]
Signed-off-by: Madan Mohan Koyyalamudi <mkoyya@codeaurora.org>
Merge "Revert "msm_fb: display: blt always enabled for 720p,1080p, secure buf""
Conflicts:
	drivers/char/diag/diag_debugfs.c
	drivers/char/diag/diag_masks.c
	drivers/char/diag/diagchar_core.c
Merge "msm: kgsl: Cleanup memdesc flags"
Conflicts:
	drivers/gpu/msm/kgsl_sharedmem.c
	drivers/gpu/msm/kgsl_sharedmem.h
Merge "msm: kgsl: Add GFP_NORETRY to the page_alloc flags and handle errors"
Conflicts:
	drivers/gpu/msm/kgsl_sharedmem.c
Merge "board-8960: Update 8960AB and 8064AB SPM sequences."
Conflicts:
	arch/arm/mach-msm/board-8960.c