On Wed, Apr 24, 2019 at 3:21 AM Dave Airlie <airlied@xxxxxxxxx> wrote: > > Hey Linus, > > We interrupt your regularly scheduled drm fixes for a regression special. > > The first is for a fix in i915 that had unexpected side effects > fallout in the userspace X.org modesetting driver where X would no > longer start. I got tired of the nitpicking and issued a large hammer > on it. The X.org driver is buggy, but blackscreen regressions are > worse. > > 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. > > Dave. > > drm-fixes-2019-04-24: > drm regression fixes (i915 and virtio-gpu) > The following changes since commit 085b7755808aa11f78ab9377257e1dad2e6fa4bb: > > Linux 5.1-rc6 (2019-04-21 10:45:57 -0700) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2019-04-24 > > for you to fetch changes up to a0cecc23cfcbf2626497a8c8770856dd56b67917: > > Revert "drm/virtio: drop prime import/export callbacks" (2019-04-24 > 10:52:52 +1000) > > ---------------------------------------------------------------- > drm regression fixes (i915 and virtio-gpu) > > ---------------------------------------------------------------- > Dave Airlie (2): > Revert "drm/i915/fbdev: Actually configure untiled displays" This will conflict badly with the refactor in drm-next: commit 09ded8af57bcef7287b8242087d3e7556380de62 Author: Noralf Trønnes <noralf@xxxxxxxxxxx> Date: Sun Apr 7 18:52:34 2019 +0200 drm/i915/fbdev: Move intel_fb_initial_config() to fbdev helper Probably best if we cherry-pick the revert over to avoid accidentally reintroducing this regression in the next merge window? Since the code moved I think a backmerge is to non-obvious about what's going on ... Adding Noralf. -Daniel > Revert "drm/virtio: drop prime import/export callbacks" > > drivers/gpu/drm/i915/intel_fbdev.c | 12 +++++------- > drivers/gpu/drm/virtio/virtgpu_drv.c | 4 ++++ > drivers/gpu/drm/virtio/virtgpu_drv.h | 4 ++++ > drivers/gpu/drm/virtio/virtgpu_prime.c | 12 ++++++++++++ > 4 files changed, 25 insertions(+), 7 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel