samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/msm/sde: fix unpaired sde trace

Browse Source 
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 <midaschieh@google.com>
(cherry picked from commit 3a335059bf7a200977e8f4e0a4aa5c6ceca3863a)
Signed-off-by: Christopher Braga <cbraga@codeaurora.org>
Signed-off-by: Samantha Tran <samtran@codeaurora.org>
This commit is contained in:
Midas Chien
2019-07-08 09:27:39 -07:00
committed by Lakshmi Narayana Kalavala
parent 984f48452d
commit 216abbf9fa
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
msm/dsi/dsi_drm.c
View File

@@ -194,14 +194,15 @@ static void dsi_bridge_pre_enable(struct drm_bridge *bridge)
return; return;
} }
SDE_ATRACE_BEGIN("dsi_bridge_pre_enable"); SDE_ATRACE_BEGIN("dsi_display_prepare");
rc = dsi_display_prepare(c_bridge->display); rc = dsi_display_prepare(c_bridge->display);
if (rc) { if (rc) {
pr_err("[%d] DSI display prepare failed, rc=%d\n", pr_err("[%d] DSI display prepare failed, rc=%d\n",
c_bridge->id, rc); c_bridge->id, rc);
SDE_ATRACE_END("dsi_bridge_pre_enable"); SDE_ATRACE_END("dsi_display_prepare");
return; return;
} }
SDE_ATRACE_END("dsi_display_prepare");
SDE_ATRACE_BEGIN("dsi_display_enable"); SDE_ATRACE_BEGIN("dsi_display_enable");
rc = dsi_display_enable(c_bridge->display); 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); (void)dsi_display_unprepare(c_bridge->display);
} }
SDE_ATRACE_END("dsi_display_enable"); SDE_ATRACE_END("dsi_display_enable");
SDE_ATRACE_END("dsi_bridge_pre_enable");
rc = dsi_display_splash_res_cleanup(c_bridge->display); rc = dsi_display_splash_res_cleanup(c_bridge->display);
if (rc) if (rc)

4
msm/sde_power_handle.c
View File

@@ -788,8 +788,8 @@ int sde_power_resource_enable(struct sde_power_handle *phandle, bool enable)
} }
SDE_EVT32_VERBOSE(enable, SDE_EVTLOG_FUNC_EXIT); SDE_EVT32_VERBOSE(enable, SDE_EVTLOG_FUNC_EXIT);
mutex_unlock(&phandle->phandle_lock);
SDE_ATRACE_END("sde_power_resource_enable"); SDE_ATRACE_END("sde_power_resource_enable");
mutex_unlock(&phandle->phandle_lock);
return rc; return rc;
clk_err: clk_err:
@@ -804,8 +804,8 @@ vreg_err:
&phandle->data_bus_handle[i], &phandle->data_bus_handle[i],
SDE_POWER_HANDLE_DISABLE_BUS_AB_QUOTA, SDE_POWER_HANDLE_DISABLE_BUS_AB_QUOTA,
SDE_POWER_HANDLE_DISABLE_BUS_IB_QUOTA); SDE_POWER_HANDLE_DISABLE_BUS_IB_QUOTA);
mutex_unlock(&phandle->phandle_lock);
SDE_ATRACE_END("sde_power_resource_enable"); SDE_ATRACE_END("sde_power_resource_enable");
mutex_unlock(&phandle->phandle_lock);
return rc; return rc;
} }