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

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

Merge "drm/msm/sde: fix deadlock between ESD check and power mode update"

parents 17871470 838b385c

drivers/gpu/drm/msm/sde/sde_connector.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -471,8 +471,11 @@ static int _sde_connector_update_power_locked(struct sde_connector *c_conn) 
	}

	}

	c_conn->last_panel_power_mode = mode;

	c_conn->last_panel_power_mode = mode;





	if (mode != SDE_MODE_DPMS_ON)

	if (mode != SDE_MODE_DPMS_ON) {

		mutex_unlock(&c_conn->lock);

		sde_connector_schedule_status_work(connector, false);

		sde_connector_schedule_status_work(connector, false);

		mutex_lock(&c_conn->lock);

	}





	return rc;

	return rc;

}

}