diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2019-01-18 13:20:14 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2019-01-28 14:24:53 +0100 |
| commit | 26d4707d445dcc07d213742bb47bedf9a63e6a05 (patch) | |
| tree | 2fc278ca63fbf707f872e8a691a0be7ecb1dd3b7 | |
| parent | 9b369116fd0ecd3e4fb3d82f8d61859d9607f9b3 (diff) | |
| download | linux-26d4707d445dcc07d213742bb47bedf9a63e6a05.tar.bz2 | |
drm/qxl: use generic fbdev emulation
Switch qxl over to the new generic fbdev emulation.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Noralf Trønnes <noralf@tronnes.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20190118122020.27596-18-kraxel@redhat.com
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_display.c | 7 | ||||
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_drv.c | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c index a18afd21cc41..e8c646ffab90 100644 --- a/drivers/gpu/drm/qxl/qxl_display.c +++ b/drivers/gpu/drm/qxl/qxl_display.c @@ -1225,18 +1225,11 @@ int qxl_modeset_init(struct qxl_device *qdev) qxl_display_read_client_monitors_config(qdev); drm_mode_config_reset(&qdev->ddev); - - /* primary surface must be created by this point, to allow - * issuing command queue commands and having them read by - * spice server. */ - qxl_fbdev_init(qdev); return 0; } void qxl_modeset_fini(struct qxl_device *qdev) { - qxl_fbdev_fini(qdev); - qxl_destroy_monitors_object(qdev); drm_mode_config_cleanup(&qdev->ddev); } diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index fd987d62d902..a1eccefab830 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c @@ -94,6 +94,8 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (ret) goto modeset_cleanup; + drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, 0, "qxl"); + drm_fbdev_generic_setup(&qdev->ddev, 32); return 0; modeset_cleanup: |