diff options
| author | Gabriel Krisman Bertazi <krisman@collabora.co.uk> | 2017-02-27 23:43:17 +0300 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2017-02-28 19:26:10 +0300 |
| commit | 64ca824e71b5d045ae1decc1b9f5a78a85dcd57b (patch) | |
| tree | ffb720945fdecda98f658e3cf20496e1a748735c /drivers/gpu/drm/qxl/qxl_drv.c | |
| parent | 715a11fabbe6aa01daefc7bef34a08f4933237ce (diff) | |
| download | linux-64ca824e71b5d045ae1decc1b9f5a78a85dcd57b.tar.xz | |
drm: qxl: Don't initialize vblank support
qxl don't have support for hardware vblanks so we can't initialize it
here, otherwise we risk getting stuck in drm_wait_one_vblank.
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170227204328.18761-4-krisman@collabora.co.uk
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/qxl/qxl_drv.c')
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_drv.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index e141db9c6211..67e94f4f3ce8 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c @@ -83,13 +83,9 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (ret) goto disable_pci; - ret = drm_vblank_init(&qdev->ddev, 1); - if (ret) - goto unload; - ret = qxl_modeset_init(qdev); if (ret) - goto vblank_cleanup; + goto unload; drm_kms_helper_poll_init(&qdev->ddev); @@ -102,8 +98,6 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) modeset_cleanup: qxl_modeset_fini(qdev); -vblank_cleanup: - drm_vblank_cleanup(&qdev->ddev); unload: qxl_device_fini(qdev); disable_pci: |