diff options
| author | Kristian H. Kristensen <hoegsberg@gmail.com> | 2018-12-19 19:57:41 +0300 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2018-12-19 22:43:25 +0300 |
| commit | 99c66bc051e7407fe0bf0607b142ec0be1a1d1dd (patch) | |
| tree | a5c6c79b200e45b9545390eb74ff2a9b3bc73ed6 /drivers/gpu/drm/msm | |
| parent | ba0ede185ef4c74bfecfe1c992be5dbcc5c5ac04 (diff) | |
| download | linux-99c66bc051e7407fe0bf0607b142ec0be1a1d1dd.tar.xz | |
drm/msm: Unblock writer if reader closes file
Prevents deadlock when fifo is full and reader closes file.
Signed-off-by: Kristian H. Kristensen <hoegsberg@chromium.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_rd.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c index b5672061ae08..d990b5f5154c 100644 --- a/drivers/gpu/drm/msm/msm_rd.c +++ b/drivers/gpu/drm/msm/msm_rd.c @@ -115,7 +115,9 @@ static void rd_write(struct msm_rd_state *rd, const void *buf, int sz) char *fptr = &fifo->buf[fifo->head]; int n; - wait_event(rd->fifo_event, circ_space(&rd->fifo) > 0); + wait_event(rd->fifo_event, circ_space(&rd->fifo) > 0 || !rd->open); + if (!rd->open) + return; /* Note that smp_load_acquire() is not strictly required * as CIRC_SPACE_TO_END() does not access the tail more @@ -213,7 +215,10 @@ out: static int rd_release(struct inode *inode, struct file *file) { struct msm_rd_state *rd = inode->i_private; + rd->open = false; + wake_up_all(&rd->fifo_event); + return 0; } |