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

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

Merge "drm/msm/dsi-staging: serialize DSI ESD trigger commands"

parents 7851ced5 068d4591

drivers/gpu/drm/msm/dsi-staging/dsi_display.c

+5 −0
Original line number Diff line number Diff line
@@ -388,6 +388,7 @@ static irqreturn_t dsi_display_panel_te_irq_handler(int irq, void *data) 
	if (!display)

		return IRQ_HANDLED;



	SDE_EVT32(SDE_EVTLOG_FUNC_CASE1);

	complete_all(&display->esd_te_gate);

	return IRQ_HANDLED;

}
@@ -1265,6 +1266,10 @@ static ssize_t debugfs_esd_trigger_check(struct file *file, 
	if (!user_len || !user_buf)

		return -EINVAL;



	if (!display->panel ||

		atomic_read(&display->panel->esd_recovery_pending))

		return user_len;



	buf = kzalloc(user_len, GFP_KERNEL);

	if (!buf)

		return -ENOMEM;