Backmerge drm-fixes merge into drm-next

Commit '6f6a73c8b7' from Linus' tree

The fixes reverts cause a bit of a conflict pain with intel next,
start fixing it up here.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2020-09-09 07:46:32 +10:00
commit 61d98185b4
16 changed files with 411 additions and 68 deletions