Merge branch 'drm-misc-fixes' of ssh://git.freedesktop.org/git/drm/drm-misc into...
authorDave Airlie <airlied@redhat.com>
Fri, 31 Dec 2021 01:40:29 +0000 (11:40 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 31 Dec 2021 01:40:29 +0000 (11:40 +1000)
This merges two fixes that haven't been sent to me yet, but I wanted to get in.

One amdgpu fix, but one nouveau regression fixer.

Signed-off-by: Dave Airlie <airlied@redhat.com>

Trivial merge