diff options
author | 2018-12-13 14:49:15 +0100 | |
---|---|---|
committer | 2018-12-14 09:40:27 +0100 | |
commit | 48a77d66cb7f557635f4fccd5abfc1ac2f71b9de (patch) | |
tree | ddd8eb46822a95d5d00bf26b35b110b3040b08ee /drivers/gpu/drm/virtio/virtgpu_drv.c | |
parent | drm: Remove complete task from TODO documentation (diff) | |
download | wireguard-linux-48a77d66cb7f557635f4fccd5abfc1ac2f71b9de.tar.xz wireguard-linux-48a77d66cb7f557635f4fccd5abfc1ac2f71b9de.zip |
drm/virtio: switch to generic fbdev emulation
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20181213134915.24722-1-kraxel@redhat.com
Diffstat (limited to 'drivers/gpu/drm/virtio/virtgpu_drv.c')
-rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_drv.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c index f7f32a885af7..7df50920c1e0 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.c +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c @@ -42,13 +42,20 @@ module_param_named(modeset, virtio_gpu_modeset, int, 0400); static int virtio_gpu_probe(struct virtio_device *vdev) { + int ret; + if (vgacon_text_force() && virtio_gpu_modeset == -1) return -EINVAL; if (virtio_gpu_modeset == 0) return -EINVAL; - return drm_virtio_init(&driver, vdev); + ret = drm_virtio_init(&driver, vdev); + if (ret) + return ret; + + drm_fbdev_generic_setup(vdev->priv, 32); + return 0; } static void virtio_gpu_remove(struct virtio_device *vdev) |