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

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

Merge "drm/msm/dp: fix race condition during simulation"

parents 17a75fb7 6957735b

drivers/gpu/drm/msm/dp/dp_aux.c

+9 −1
Original line number Diff line number Diff line
@@ -479,6 +479,8 @@ static ssize_t dp_aux_transfer_debug(struct drm_dp_aux *drm_aux, 
	struct dp_aux_private *aux = container_of(drm_aux,

		struct dp_aux_private, drm_aux);



	mutex_lock(&aux->mutex);



	ret = dp_aux_transfer_ready(aux, msg, false);

	if (ret)

		goto end;
@@ -536,12 +538,14 @@ static ssize_t dp_aux_transfer_debug(struct drm_dp_aux *drm_aux, 
			DP_AUX_NATIVE_REPLY_DEFER : DP_AUX_I2C_REPLY_DEFER;

	}



	return msg->size;

	ret = msg->size;

	goto end;



address_error:

	memset(msg->buffer, 0, msg->size);

	ret = msg->size;

end:

	mutex_unlock(&aux->mutex);

	return ret;

}
@@ -720,6 +724,8 @@ static void dp_aux_set_sim_mode(struct dp_aux *dp_aux, bool en, 


	aux = container_of(dp_aux, struct dp_aux_private, dp_aux);



	mutex_lock(&aux->mutex);



	aux->edid = edid;

	aux->dpcd = dpcd;
@@ -727,6 +733,8 @@ static void dp_aux_set_sim_mode(struct dp_aux *dp_aux, bool en, 
		aux->drm_aux.transfer = dp_aux_transfer_debug;

	else

		aux->drm_aux.transfer = dp_aux_transfer;



	mutex_unlock(&aux->mutex);

}



static int dp_aux_configure_aux_switch(struct dp_aux *dp_aux,

drivers/gpu/drm/msm/dp/dp_debug.c

+7 −5
Original line number Diff line number Diff line
@@ -1079,7 +1079,14 @@ static ssize_t dp_debug_write_sim(struct file *file, 


		if (dp_debug_get_dpcd_buf(debug))

			goto error;



		debug->dp_debug.sim_mode = true;

		debug->aux->set_sim_mode(debug->aux, true,

			debug->edid, debug->dpcd);

	} else {

		debug->aux->set_sim_mode(debug->aux, false, NULL, NULL);

		debug->dp_debug.sim_mode = false;



		if (debug->edid) {

			devm_kfree(debug->dev, debug->edid);

			debug->edid = NULL;
@@ -1090,11 +1097,6 @@ static ssize_t dp_debug_write_sim(struct file *file, 
			debug->dpcd = NULL;

		}

	}



	debug->dp_debug.sim_mode = !!sim;



	debug->aux->set_sim_mode(debug->aux, debug->dp_debug.sim_mode,

			debug->edid, debug->dpcd);

end:

	return len;

error: