A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-25 22:23:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "drm/msm/sde: fix unpaired sde trace"

Browse source
This commit is contained in:
qctecmdr 2019-07-22 13:55:17 -07:00 • committed by Gerrit - the friendly Code Review server
commit f95b75fdc6
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;
}
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)

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);
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;
}