Merge branch 'linux-5.9' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Fri, 4 Sep 2020 01:14:24 +0000 (11:14 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 4 Sep 2020 01:14:49 +0000 (11:14 +1000)
A couple of minor fixes to the display changes that went in for 5.9.
The most important of which is a workaround for a HW bug that was
exposed by better push buffer space management, leading to
random(ish...) display engine hangs.

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

Trivial merge