diff options
| author | Qiang Yu <yuq825@gmail.com> | 2020-07-19 15:30:50 +0800 |
|---|---|---|
| committer | Qiang Yu <yuq825@gmail.com> | 2020-07-20 08:46:06 +0800 |
| commit | f3f90c6db188d437add55aaffadd5ad5bcb8cda6 (patch) | |
| tree | 670394334f2c840b8ef2cf3ff249b01e97b3a925 | |
| parent | baa1841eb797eadce6c907bdaed7cd6f01815404 (diff) | |
drm/lima: fix wait pp reset timeoutdrm-misc-fixes-2020-07-22
PP bcast is marked as doing async reset after job is done.
When resume after suspend, each PP is reset individually,
so no need to reset in PP bcast resume. But I forgot to
clear the PP bcast async reset mark so call into async wait
before job run and gets timeout.
Closes: https://gitlab.freedesktop.org/lima/linux/-/issues/34
Fixes: 3446d7e9883d ("drm/lima: add resume/suspend callback for each ip")
Reviewed-by: Erico Nunes <nunes.erico@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200719073050.776962-1-yuq825@gmail.com
| -rw-r--r-- | drivers/gpu/drm/lima/lima_pp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/lima/lima_pp.c b/drivers/gpu/drm/lima/lima_pp.c index 33f01383409c..a5c95bed08c0 100644 --- a/drivers/gpu/drm/lima/lima_pp.c +++ b/drivers/gpu/drm/lima/lima_pp.c @@ -271,6 +271,8 @@ void lima_pp_fini(struct lima_ip *ip) int lima_pp_bcast_resume(struct lima_ip *ip) { + /* PP has been reset by individual PP resume */ + ip->data.async_reset = false; return 0; } |