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

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

Merge "disp: msm: avoid esd check during pm_suspend state"

parents 5308bff6 9d881a19

msm/dsi/dsi_display.c

+4 −2
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ int dsi_display_check_status(struct drm_connector *connector, void *display, 
	struct dsi_display *dsi_display = display;

	struct dsi_panel *panel;

	u32 status_mode;

	int rc = 0x1;

	int rc = 0x1, ret;

	u32 mask;



	if (!dsi_display || !dsi_display->panel)
@@ -839,8 +839,10 @@ int dsi_display_check_status(struct drm_connector *connector, void *display, 
		goto exit;

	}



	dsi_display_clk_ctrl(dsi_display->dsi_clk_handle,

	ret = dsi_display_clk_ctrl(dsi_display->dsi_clk_handle,

		DSI_ALL_CLKS, DSI_CLK_ON);

	if (ret)

		goto release_panel_lock;



	/* Mask error interrupts before attempting ESD read */

	mask = BIT(DSI_FIFO_OVERFLOW) | BIT(DSI_FIFO_UNDERFLOW);

msm/sde/sde_connector.c

+4 −1
Original line number Diff line number Diff line
@@ -2215,6 +2215,7 @@ static void sde_connector_check_status_work(struct work_struct *work) 
{

	struct sde_connector *conn;

	int rc = 0;

	struct device *dev;



	conn = container_of(to_delayed_work(work),

			struct sde_connector, status_work);
@@ -2224,7 +2225,9 @@ static void sde_connector_check_status_work(struct work_struct *work) 
	}



	mutex_lock(&conn->lock);

	if (!conn->ops.check_status ||

	dev = conn->base.dev->dev;



	if (!conn->ops.check_status || dev->power.is_suspended ||

			(conn->dpms_mode != DRM_MODE_DPMS_ON)) {

		SDE_DEBUG("dpms mode: %d\n", conn->dpms_mode);

		mutex_unlock(&conn->lock);