Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 089ee242 authored by Midas Chien's avatar Midas Chien Committed by Christopher Braga
Browse files

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.

Change-Id: I938b5648a09e00eaea59070af31a2e6469763087
Signed-off-by: default avatarMidas Chien <midaschieh@google.com>
Signed-off-by: default avatarChristopher Braga <cbraga@codeaurora.org>
parent 5c267093

drivers/gpu/drm/msm/dsi-staging/dsi_drm.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -186,14 +186,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);
@@ -203,7 +204,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)

drivers/gpu/drm/msm/sde_power_handle.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -1046,10 +1046,9 @@ int sde_power_resource_enable(struct sde_power_handle *phandle, 
				SDE_POWER_EVENT_POST_DISABLE);

				SDE_POWER_EVENT_POST_DISABLE);

	}

	}





end:

	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:
@@ -1063,8 +1062,10 @@ int sde_power_resource_enable(struct sde_power_handle *phandle, 
		sde_power_data_bus_update(&phandle->data_bus_handle[i], 0);

		sde_power_data_bus_update(&phandle->data_bus_handle[i], 0);

data_bus_hdl_err:

data_bus_hdl_err:

	phandle->current_usecase_ndx = prev_usecase_ndx;

	phandle->current_usecase_ndx = prev_usecase_ndx;

	mutex_unlock(&phandle->phandle_lock);

	SDE_ATRACE_END("sde_power_resource_enable");

	SDE_ATRACE_END("sde_power_resource_enable");



end:

	mutex_unlock(&phandle->phandle_lock);

	return rc;

	return rc;

}

}