]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "drm/virtio: drop prime import/export callbacks"
authorDave Airlie <airlied@redhat.com>
Wed, 24 Apr 2019 00:52:20 +0000 (10:52 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 24 Apr 2019 00:52:52 +0000 (10:52 +1000)
commit5af6288344a219810144dc45cdb54296965d0b40
tree74e7055af31ad5ce1b45082cb6b1e80722b4f59b
parent864732691fce8c40cc3f07b5bdaa46f03b7d28b3
Revert "drm/virtio: drop prime import/export callbacks"

This patch does more harm than good, as it breaks both Xwayland and
gnome-shell with X11.

Xwayland requires DRI3 & DRI3 requires PRIME.

X11 crash for obscure double-free reason which are hard to debug
(starting X11 by hand doesn't trigger the crash).

I don't see an apparent problem implementing those stub prime
functions, they may return an error at run-time, and it seems to be
handled fine by GNOME at least.

This reverts commit 5ec6f9a51e67b3dd03063629222e6832e97104e0.
[airlied:
This broke userspace for virtio-gpus, and regressed things from DRI3 to DRI2.

This brings back the original problem, but it's better than regressions.]

Fixes: 5ec6f9a51e67b3dd03063629222e6832e97104 ("drm/virtio: drop prime import/export callbacks")
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/virtio/virtgpu_drv.c
drivers/gpu/drm/virtio/virtgpu_drv.h
drivers/gpu/drm/virtio/virtgpu_prime.c