Commit 26d4707d authored by Gerd Hoffmann's avatar Gerd Hoffmann

drm/qxl: use generic fbdev emulation

Switch qxl over to the new generic fbdev emulation.
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Acked-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20190118122020.27596-18-kraxel@redhat.com
parent 9b369116
...@@ -1225,18 +1225,11 @@ int qxl_modeset_init(struct qxl_device *qdev) ...@@ -1225,18 +1225,11 @@ int qxl_modeset_init(struct qxl_device *qdev)
qxl_display_read_client_monitors_config(qdev); qxl_display_read_client_monitors_config(qdev);
drm_mode_config_reset(&qdev->ddev); 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; return 0;
} }
void qxl_modeset_fini(struct qxl_device *qdev) void qxl_modeset_fini(struct qxl_device *qdev)
{ {
qxl_fbdev_fini(qdev);
qxl_destroy_monitors_object(qdev); qxl_destroy_monitors_object(qdev);
drm_mode_config_cleanup(&qdev->ddev); drm_mode_config_cleanup(&qdev->ddev);
} }
...@@ -94,6 +94,8 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -94,6 +94,8 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (ret) if (ret)
goto modeset_cleanup; goto modeset_cleanup;
drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, 0, "qxl");
drm_fbdev_generic_setup(&qdev->ddev, 32);
return 0; return 0;
modeset_cleanup: modeset_cleanup:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment