diff options
| author |   Dave Airlie <airlied@redhat.com> | 2019-03-14 11:37:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-03-14 11:37:46 +1000 |
| commit | 74cd45fa90a234de92a3f3ce8bdabeb643b546a5 (patch) | |
| tree | 3a8c874c5ece28e93bc90f13e01fbecdd8eff29c /drivers/gpu/drm/qxl | |
| parent | Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next (diff) | |
| parent | drm/qxl: remove conflicting framebuffers earlier (diff) | |
| download | linux-dev-74cd45fa90a234de92a3f3ce8bdabeb643b546a5.tar.xz linux-dev-74cd45fa90a234de92a3f3ce8bdabeb643b546a5.zip | |
Merge tag 'drm-misc-next-fixes-2019-03-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
- qxl: Remove the conflicting framebuffers earlier
- Split out some i915 code into the fb_helper to allow the above
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190313192158.k3qssf733khsqodn@flea
Diffstat (limited to 'drivers/gpu/drm/qxl')
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_drv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index bb81e310eb6d..578d867a81d5 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c @@ -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; |