Merge branch 'linux-5.14' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Thu, 19 Aug 2021 20:57:44 +0000 (06:57 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 19 Aug 2021 23:18:14 +0000 (09:18 +1000)
- Ampere display fixes
- Fix longstanding MM race issue by removing unused code.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv5jtUFkHsGe-pf-=RceDOgKygjPnCi=6d5vCLM_f5aeMQ@mail.gmail.com

Trivial merge