From 216abbf9fae2bb04b2c54d783b5a1779075e7474 Mon Sep 17 00:00:00 2001 From: Midas Chien Date: Mon, 8 Jul 2019 09:27:39 -0700 Subject: [PATCH] drm/msm/sde: fix unpaired sde trace Unpaired trace "sde_power_resource_enable" caused tracer parse incorrect trace points and display weird state on Chrome. Make trace "sde_power_resource_enable" pair to fix it. Bug: 122510119 Test: Checked sde trace can be displayed correctly on Chrome Change-Id: I938b5648a09e00eaea59070af31a2e6469763087 Signed-off-by: Midas Chien (cherry picked from commit 3a335059bf7a200977e8f4e0a4aa5c6ceca3863a) Signed-off-by: Christopher Braga Signed-off-by: Samantha Tran --- msm/dsi/dsi_drm.c | 6 +++--- msm/sde_power_handle.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/msm/dsi/dsi_drm.c b/msm/dsi/dsi_drm.c index d86c27062cb0..982ed4fd4c01 100644 --- a/msm/dsi/dsi_drm.c +++ b/msm/dsi/dsi_drm.c @@ -194,14 +194,15 @@ static void dsi_bridge_pre_enable(struct drm_bridge *bridge) return; } - SDE_ATRACE_BEGIN("dsi_bridge_pre_enable"); + SDE_ATRACE_BEGIN("dsi_display_prepare"); rc = dsi_display_prepare(c_bridge->display); if (rc) { pr_err("[%d] DSI display prepare failed, rc=%d\n", c_bridge->id, rc); - SDE_ATRACE_END("dsi_bridge_pre_enable"); + SDE_ATRACE_END("dsi_display_prepare"); return; } + SDE_ATRACE_END("dsi_display_prepare"); SDE_ATRACE_BEGIN("dsi_display_enable"); rc = dsi_display_enable(c_bridge->display); @@ -211,7 +212,6 @@ static void dsi_bridge_pre_enable(struct drm_bridge *bridge) (void)dsi_display_unprepare(c_bridge->display); } SDE_ATRACE_END("dsi_display_enable"); - SDE_ATRACE_END("dsi_bridge_pre_enable"); rc = dsi_display_splash_res_cleanup(c_bridge->display); if (rc) diff --git a/msm/sde_power_handle.c b/msm/sde_power_handle.c index 9a797714f475..1ed7c4885de5 100644 --- a/msm/sde_power_handle.c +++ b/msm/sde_power_handle.c @@ -788,8 +788,8 @@ int sde_power_resource_enable(struct sde_power_handle *phandle, bool enable) } SDE_EVT32_VERBOSE(enable, SDE_EVTLOG_FUNC_EXIT); - mutex_unlock(&phandle->phandle_lock); SDE_ATRACE_END("sde_power_resource_enable"); + mutex_unlock(&phandle->phandle_lock); return rc; clk_err: @@ -804,8 +804,8 @@ vreg_err: &phandle->data_bus_handle[i], SDE_POWER_HANDLE_DISABLE_BUS_AB_QUOTA, SDE_POWER_HANDLE_DISABLE_BUS_IB_QUOTA); - mutex_unlock(&phandle->phandle_lock); SDE_ATRACE_END("sde_power_resource_enable"); + mutex_unlock(&phandle->phandle_lock); return rc; }