Merge branch '04.01-ampere-lite' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Fri, 29 Jan 2021 01:05:41 +0000 (11:05 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 29 Jan 2021 01:31:55 +0000 (11:31 +1000)
Mostly a regression fixes here, a couple of which could lead to
display hanging, and have been affecting a number of users.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv4Y0ZiAevSvgphLAOaZjFi75ECXqUD9ShBvRxZ6S-pb9Q@mail.gmail.com

Trivial merge