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

Commit 901daeb3 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: fix deadlock in sde rsc client destroy api" into msm-4.9

parents 8cae2a52 bd8bbfe9

drivers/gpu/drm/msm/sde_rsc.c

+6 −1
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ EXPORT_SYMBOL(sde_rsc_client_create); 
void sde_rsc_client_destroy(struct sde_rsc_client *client)

{

	struct sde_rsc_priv *rsc;

	enum sde_rsc_state state;



	if (!client) {

		pr_debug("invalid client\n");
@@ -138,9 +139,13 @@ void sde_rsc_client_destroy(struct sde_rsc_client *client) 
		goto end;



	mutex_lock(&rsc->client_lock);

	if (client->current_state != SDE_RSC_IDLE_STATE)

	state = client->current_state;

	mutex_unlock(&rsc->client_lock);



	if (state != SDE_RSC_IDLE_STATE)

		sde_rsc_client_state_update(client, SDE_RSC_IDLE_STATE,

								NULL, -1);

	mutex_lock(&rsc->client_lock);

	list_del_init(&client->list);

	mutex_unlock(&rsc->client_lock);