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

Commit 257d0bbd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: enable clocks before doing SW reset during recovery"

parents 5b906847 54c56b23
Loading
Loading
Loading
Loading
+12 −4
Original line number Diff line number Diff line
@@ -2586,15 +2586,23 @@ static int dsi_event_thread(void *data)
				mdss_dsi_clk_ctrl(ctrl, ctrl->dsi_clk_handle,
						  MDSS_DSI_ALL_CLKS,
						  MDSS_DSI_CLK_OFF);
			}
			mutex_unlock(&ctrl->mutex);
			} else {
				MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0_ctrl",
				"dsi0_phy", "dsi1_ctrl", "dsi1_phy", "vbif",
				"vbif_nrt", "dbg_bus", "vbif_dbg_bus", "panic");
			}
			mutex_unlock(&ctrl->mutex);
		}

		if (todo & DSI_EV_DSI_FIFO_EMPTY)
		if (todo & DSI_EV_DSI_FIFO_EMPTY) {
			mdss_dsi_clk_ctrl(ctrl, ctrl->dsi_clk_handle,
					  MDSS_DSI_CORE_CLK,
					  MDSS_DSI_CLK_ON);
			mdss_dsi_sw_reset(ctrl, true);
			mdss_dsi_clk_ctrl(ctrl, ctrl->dsi_clk_handle,
					  MDSS_DSI_CORE_CLK,
					  MDSS_DSI_CLK_OFF);
		}

		if (todo & DSI_EV_DLNx_FIFO_OVERFLOW) {
			mutex_lock(&dsi_mtx);