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

diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index a18afd21cc41e4f64d0f679900e57f4789cfa539..e8c646ffab901be2764fa894230d8bf72769e50f 100644 (file)
--- 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 fd987d62d90281b653cc3a9a24f7a6be4d2469dd..a1eccefab830cc9b374c0a60711b7c96f4862e74 100644 (file)
--- 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: