Skip to content

Commit

Permalink
drm/msm/rd: Fix FIFO-full deadlock
Browse files Browse the repository at this point in the history
[ Upstream commit 174974d ]

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: Rob 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: Sasha Levin <sashal@kernel.org>
  • Loading branch information
robclark authored and gregkh committed Sep 20, 2022
1 parent df01ac6 commit f25a547
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/gpu/drm/msm/msm_rd.c
Expand Up @@ -196,6 +196,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.
*
Expand Down

0 comments on commit f25a547

Please sign in to comment.