diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-24 13:35:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-24 13:35:55 -0700 |
| commit | 88fff0b7dcc132c924d710d75d1401264b6d0ef6 (patch) | |
| tree | e4177b2e4a3de422b0acf5d909a01227b58dbb28 /drivers/gpu/drm/lima/lima_pp.c | |
| parent | f37e99aca03f63aa3f2bd13ceaf769455d12c4b0 (diff) | |
| parent | d8904ca9d338cdaa67e3bd06d7a7d418e426648c (diff) | |
Merge tag 'drm-fixes-2020-07-24' of git://anongit.freedesktop.org/drm/drm into master
Pull drm fixes from Dave Airlie:
"Quiet fixes, I may have a single regression fix follow up to this for
nouveau, but it might be next week, Ben was testing it a bit more .
Otherwise two amdgpu fixes, one lima and one sun4i:
amdgpu:
- Fix crash when overclocking VegaM
- Fix possible crash when editing dpm levels
sun4i:
- Fix inverted HPD result; fixes an earlier fix
lima:
- fix timeout during reset"
* tag 'drm-fixes-2020-07-24' of git://anongit.freedesktop.org/drm/drm:
drm/amdgpu: Fix NULL dereference in dpm sysfs handlers
drm/amd/powerplay: fix a crash when overclocking Vega M
drm/lima: fix wait pp reset timeout
drm: sun4i: hdmi: Fix inverted HPD result
Diffstat (limited to 'drivers/gpu/drm/lima/lima_pp.c')
| -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 33f01383409c0..a5c95bed08c09 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; } |