* [PATCH v4 2/2] drm/qxl: remove conflicting framebuffers earlier [not found] <20190222071604.26024-1-kraxel@redhat.com> @ 2019-02-22 7:16 ` Gerd Hoffmann 2019-02-22 9:51 ` Daniel Vetter 0 siblings, 1 reply; 2+ messages in thread From: Gerd Hoffmann @ 2019-02-22 7:16 UTC (permalink / raw) To: dri-devel Cc: daniel, Gerd Hoffmann, Dave Airlie, David Airlie, open list:DRM DRIVER FOR QXL VIRTUAL GPU, open list:DRM DRIVER FOR QXL VIRTUAL GPU, open list Add error checking while being at it. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- drivers/gpu/drm/qxl/qxl_drv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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; -- 2.9.3 ^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v4 2/2] drm/qxl: remove conflicting framebuffers earlier 2019-02-22 7:16 ` [PATCH v4 2/2] drm/qxl: remove conflicting framebuffers earlier Gerd Hoffmann @ 2019-02-22 9:51 ` Daniel Vetter 0 siblings, 0 replies; 2+ messages in thread From: Daniel Vetter @ 2019-02-22 9:51 UTC (permalink / raw) To: Gerd Hoffmann Cc: dri-devel, daniel, Dave Airlie, David Airlie, open list:DRM DRIVER FOR QXL VIRTUAL GPU, open list:DRM DRIVER FOR QXL VIRTUAL GPU, open list On Fri, Feb 22, 2019 at 08:16:04AM +0100, Gerd Hoffmann wrote: > Add error checking while being at it. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/qxl/qxl_drv.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > 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; > > -- > 2.9.3 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-22 9:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20190222071604.26024-1-kraxel@redhat.com>
2019-02-22 7:16 ` [PATCH v4 2/2] drm/qxl: remove conflicting framebuffers earlier Gerd Hoffmann
2019-02-22 9:51 ` Daniel Vetter
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®