Merge tag 'drm-fixes-2019-04-24' of git://

Pull drm regression fixes from Dave Airlie:
 "We interrupt your regularly scheduled drm fixes for a regression

  The first is for a fix in i915 that had unexpected side effects
  fallout in the userspace modesetting driver where X would no
  longer start. I got tired of the nitpicking and issued a large hammer
  on it. The driver is buggy, but blackscreen regressions are

  The second was an oversight that myself and Gerd should have noticed
  better, Gerd is trying to fix this properly, but the regression is too
  large to leave, even if the original behaviour is bad in some cases,
  it's clearly bad to break a bunch of working use cases.

  I'll likely have a regular fixes pull later, but I really wanted to
  highlight these"

* tag 'drm-fixes-2019-04-24' of git://
  Revert "drm/virtio: drop prime import/export callbacks"
  Revert "drm/i915/fbdev: Actually configure untiled displays"