Commit ebc3e491 authored by Rob Clark's avatar Rob Clark Committed by Jialin Zhang
Browse files

drm/msm/rd: Fix FIFO-full deadlock 

stable inclusion
from stable-v5.10.144
commit cff2b3a50c69c0c72593f87190c88d0235df6503
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6D0V7

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=cff2b3a50c69c0c72593f87190c88d0235df6503



--------------------------------

[ Upstream commit 174974d8 ]

If the previous thing cat'ing $debugfs/rd left the FIFO full, then
subsequent open could deadlock in rd_write() (because open is blocked,
not giving a chance for read() to consume any data in the FIFO).  Also
it is generally a good idea to clear out old data from the FIFO.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Patchwork: https://patchwork.freedesktop.org/patch/496706/
Link: https://lore.kernel.org/r/20220807160901.2353471-2-robdclark@gmail.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 3142552e

drivers/gpu/drm/msm/msm_rd.c

+3 −0
Original line number Diff line number Diff line
@@ -191,6 +191,9 @@ static int rd_open(struct inode *inode, struct file *file) 
	file->private_data = rd;

	rd->open = true;



	/* Reset fifo to clear any previously unread data: */

	rd->fifo.head = rd->fifo.tail = 0;



	/* the parsing tools need to know gpu-id to know which

	 * register database to load.

	 */