Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c34674a2 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

drm/qxl: remove conflicting framebuffers earlier 



Add error checking while being at it.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20190301092502.30948-4-kraxel@redhat.com
parent 1c74ca7a

drivers/gpu/drm/qxl/qxl_drv.c

+4 −1
Original line number Diff line number Diff line
@@ -79,6 +79,10 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (ret)

		goto free_dev;



	ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, 0, "qxl");

	if (ret)

		goto disable_pci;



	ret = qxl_device_init(qdev, &qxl_driver, pdev);

	if (ret)

		goto disable_pci;
@@ -94,7 +98,6 @@ 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;