Merge branch 'android-msm-flo-3.4-jb-mr2' of https://android.googlesource.com/kernel/msm into cm-10.2
Revert "msm: kgsl: Add support for KGSL_CMD_SYNCPOINT_TYPE_FENCE"

This reverts commit e4a13f8ecc300aeb12be524525a29597e63812cb.

Change-Id: I1202782313439afac9ee625f695d2b7ba957d8d7
Signed-off-by: Tarun Karra <tkarra@codeaurora.org>
Revert "msm: kgsl: add kgsl_sync_fence_waiter for server side sync"

This reverts commit 878a3c0d92c0126782e7f6d77d3a52a62b28dcf8.

Change-Id: Ib2271b8402336a7d6050649f5bfe9cb47008be5f
Signed-off-by: Tarun Karra <tkarra@codeaurora.org>
Revert "msm: kgsl: Don't process events if the timestamp hasn't changed"

This reverts commit 3366075c1daab3a762a6bff510d6ebd62f3ff2a9.

Change-Id: I77c3d7a7be0c952b6a81efb385f15208b278087a
Signed-off-by: Tarun Karra <tkarra@codeaurora.org>
Revert "msm: kgsl: Add a new command submission API"

This reverts commit c177eb9e5d25e0b7cf5b5cba434b052fb36a33cd.

Change-Id: If33bd6c52ebf16d0402886f0a41c2a015ef69f8a
Signed-off-by: Tarun Karra <tkarra@codeaurora.org>
Revert "msm: kgsl: Add a command dispatcher to manage the ringbuffer"

This reverts commit a2e8ddc223934857a56bbe9bafc62f872567c787.

Change-Id: I28f4be2d28528efa9d007abc5a36be1e92e2bad4
Signed-off-by: Tarun Karra <tkarra@codeaurora.org>

Conflicts:
	drivers/gpu/msm/Makefile
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_a2xx.c
	drivers/gpu/msm/adreno_a3xx.c
	drivers/gpu/msm/adreno_dispatch.c
	drivers/gpu/msm/adreno_drawctxt.c
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/gpu/msm/adreno_trace.h
	drivers/gpu/msm/kgsl.c
	drivers/gpu/msm/kgsl_device.h
	drivers/gpu/msm/kgsl_iommu.c
	drivers/gpu/msm/kgsl_mmu.h
	drivers/gpu/msm/kgsl_pwrctrl.c
Revert "Revert "msm: kgsl: Add a command dispatcher to manage the ringbuffer""

This reverts commit d95171091bd0e63bc845406a8746bc751f569a64.

Revert "Revert "msm: kgsl: Add a new command submission API""

This reverts commit 684335cb12e18e4d932504e30034465f96453dde.

Revert "Revert "msm: kgsl: Don't process events if the timestamp hasn't changed""

This reverts commit f8ff679de19466e84cfa3b41126e8e027784bae9.

Revert "Revert "msm: kgsl: add kgsl_sync_fence_waiter for server side sync""

This reverts commit b2f6dbe0d44cd88d033537a012aa367102ca8f65.

Revert "Revert "msm: kgsl: Add support for KGSL_CMD_SYNCPOINT_TYPE_FENCE""

This reverts commit 6c370a510dfa7ace5aec7c73eb96fd88c2078e5e.

Change-Id: I24d74e97f982121ca02e47c3fc96143d4e7365e6
video: msm: Use the new fence release logic for video panel too

Change-Id: I51807e458f9db94c3ac05f8f8b108494a7fdd720
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2