cleanup mismerge with oppo
mdss: dsi: Handle gpio configuration properly

Dsi related GPIOs are freed even when gpio request fails.
Fix this by removing the gpio_free() calls when the gpio request
fails. Add the gpio_request() and gpio_free()
calls to panel reset sequence so that gpio pins would
go to suspend state when not in use.

Change-Id: Id5ef45c5cc106d2a3ced3359739037f488e1919f
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>

Conflicts:
	drivers/video/msm/mdss/mdss_dsi.c
	drivers/video/msm/mdss/mdss_dsi_panel.c
msm: mdss: Avoid GPIO warnings during boot up

During continuous splash screen handoff, we see GPIO
warnings since we try to free the GPIOs without
requesting them before. This change takes care of avoiding
these warnings.

Change-Id: I574bcf0bd28e3c33dca618103cf0285675917189
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
mdss_dsi_panel: Clean up panel reset

We didn't properly merge qcom's changes here

Change-Id: I726dbc156fd793162d4e4dc1e206c1eab88ce141

Conflicts:
	drivers/video/msm/mdss/mdss_dsi_panel.c
Revert "msm: mdss: Dynamic FPS using VFP."

This reverts commit 043d680b4f6f9093a0fff361da87bee894886cf0.

Conflicts:
	drivers/video/msm/mdss/mdss_dsi_host.c
msm: mdss: fix DCS backlight control when broadcast mode is enabled

When broadcast mode is enabled, we trigger DCS commands when cmds_tx
is done on controller 1. This call is missing in the path of
backlight control using DCS commands. Add this call to fix DCS
backlight issues for broadcast mode.

Change-Id: I18193375e180a42fb1db42fb1d52a976b660ae1c
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
msm8974: Update config for JDI dual-DSI panel
* 60 FPS (dynamic)
Merge branch 'test1' of https://github.com/kejar31/android_kernel_oppo_find7 into kk4.4
Revert "Revert "input: touch: synaptics: Reset the device when blanking display""

This reverts commit 8b9e61d3021d5a2398587aa1bf00b3ecee25b3da.

Change-Id: Ia60a6602fd8568bf7562f2ca8cc535befb9976ce