Merge "drm/msm/dsi-staging: Add pre/post clk off/on callback path" (91d96493) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+6 −14

Original line number	Diff line number	Diff line
		@@ -1278,23 +1278,15 @@ int dsi_display_link_clk_force_update(void *client)
		goto error;
		}

		rc = dsi_display_link_clk_disable(l_clks,
		(DSI_LINK_LP_CLK \| DSI_LINK_HS_CLK),
		mngr->dsi_ctrl_count, mngr->master_ndx);
		if (rc) {
		pr_err("%s, failed to stop link clk, rc = %d\n",
		__func__, rc);
		rc = dsi_clk_update_link_clk_state(mngr, l_clks, (DSI_LINK_LP_CLK \|
		DSI_LINK_HS_CLK), DSI_CLK_OFF, false);
		if (rc)
		goto error;
		}

		rc = dsi_display_link_clk_enable(l_clks,
		(DSI_LINK_LP_CLK \| DSI_LINK_HS_CLK),
		mngr->dsi_ctrl_count, mngr->master_ndx);
		if (rc) {
		pr_err("%s, failed to start link clk rc= %d\n",
		__func__, rc);
		rc = dsi_clk_update_link_clk_state(mngr, l_clks, (DSI_LINK_LP_CLK \|
		DSI_LINK_HS_CLK), DSI_CLK_ON, true);
		if (rc)
		goto error;
		}

		error:
		mutex_unlock(&mngr->clk_mutex);