From: Gerd Hoffmann <kraxel@redhat.com>
To: dri-devel@lists.freedesktop.org
Cc: David Airlie <airlied@linux.ie>,
intel-gfx@lists.freedesktop.org,
open list <linux-kernel@vger.kernel.org>,
"open list:DRM DRIVER FOR QXL VIRTUAL GPU"
<virtualization@lists.linux-foundation.org>,
daniel@ffwll.ch,
"open list:DRM DRIVER FOR QXL VIRTUAL GPU"
<spice-devel@lists.freedesktop.org>,
Dave Airlie <airlied@redhat.com>
Subject: [PATCH v7 3/4] drm/qxl: remove conflicting framebuffers earlier
Date: Fri, 1 Mar 2019 10:25:01 +0100 [thread overview]
Message-ID: <20190301092502.30948-4-kraxel__29219.5663366996$1551432970$gmane$org@redhat.com> (raw)
In-Reply-To: <20190301092502.30948-1-kraxel@redhat.com>
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
next prev parent reply other threads:[~2019-03-01 9:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-01 9:24 [PATCH v7 0/4] drm & vgaarb: handle vgacon removal in vgaarb Gerd Hoffmann
2019-03-01 9:24 ` [PATCH v7 1/4] drm: move i915_kick_out_vgacon to vgaarb Gerd Hoffmann
2019-03-01 9:24 ` Gerd Hoffmann
2019-03-01 9:25 ` [PATCH v7 2/4] drm/fb-helper: call vga_remove_vgacon automatically Gerd Hoffmann
2019-03-01 9:25 ` Gerd Hoffmann
2019-03-01 9:25 ` [PATCH v7 3/4] drm/qxl: remove conflicting framebuffers earlier Gerd Hoffmann
2019-03-01 9:25 ` Gerd Hoffmann
2019-03-01 9:25 ` Gerd Hoffmann [this message]
2019-03-01 9:25 ` [PATCH v7 4/4] drm/i915: switch to drm_fb_helper_remove_conflicting_pci_framebuffers Gerd Hoffmann
2019-03-01 9:25 ` Gerd Hoffmann
2019-03-11 12:43 ` Daniel Vetter
2019-03-01 9:45 ` ✗ Fi.CI.CHECKPATCH: warning for drm & vgaarb: handle vgacon removal in vgaarb. (rev3) Patchwork
2019-03-01 10:16 ` ✓ Fi.CI.BAT: success " Patchwork
2019-03-01 13:05 ` ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='20190301092502.30948-4-kraxel__29219.5663366996$1551432970$gmane$org@redhat.com' \
--to=kraxel@redhat.com \
--cc=airlied@linux.ie \
--cc=airlied@redhat.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=spice-devel@lists.freedesktop.org \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.