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

Commit f95b75fd authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 35882843 216abbf9

msm/dsi/dsi_drm.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -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)

msm/sde_power_handle.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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 @@ int sde_power_resource_enable(struct sde_power_handle *phandle, bool enable) 
			&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;

}

}