Merge tag 'drm-intel-fixes-2021-06-03' of git://anongit.freedesktop.org/drm/drm-intel...
authorDave Airlie <airlied@redhat.com>
Thu, 3 Jun 2021 21:29:25 +0000 (07:29 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 3 Jun 2021 21:29:26 +0000 (07:29 +1000)
commitff7a24a8fcb30adfea878d14c394300a087016ba
tree46c52439c2518e2915a6615d710892932fa5ebf2
parent59dda702c95df5aee657d5945e7dc93dbf60de6b
parentb87482dfe800f326f8f5b0093273ee6bd5b5fe9f
Merge tag 'drm-intel-fixes-2021-06-03' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes

drm/i915 fixes for v5.13-rc5:
- Revert conversion to io_mapping_map_user() which lead to BUG_ON()
- Fix check for error valued returns in a selftest

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87lf7rpcmp.fsf@intel.com