drm: qxl: Open code probing sequence for qxl

This avoids using the deprecated drm_get_pci_dev() and load() hook
interfaces in the qxl driver.

The only tricky part is to ensure TTM debugfs initialization happens
after the debugfs root node is created, which is done by moving that
code into the debufs_init() hook.

Tested on qemu with igt and running a WM on top of X.

Changes since v1:
 - Drop verification for primary minor in qxl_debugsfs_init.
Changes since V2:
 - Put new header together with other debugfs headers.

Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Gustavo Padovan <gustavo.padovan@collabora.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170119134806.8926-1-krisman@collabora.co.uk

diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
index 241af9131dc8309ecb2662da81895f7dfa99bcd9..057b2b547cac6606f6fd60f88f9e570f76b81f7b 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
@@ -84,8 +84,18 @@ int
 qxl_debugfs_init(struct drm_minor *minor)
 {
 #if defined(CONFIG_DEBUG_FS)
+       int r;
+       struct qxl_device *dev =
+               (struct qxl_device *) minor->dev->dev_private;
+
        drm_debugfs_create_files(qxl_debugfs_list, QXL_DEBUGFS_ENTRIES,
                                 minor->debugfs_root, minor);
+
+       r = qxl_ttm_debugfs_init(dev);
+       if (r) {
+               DRM_ERROR("Failed to init TTM debugfs\n");
+               return r;
+       }
 #endif
        return 0;
 }

diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c
index 460bbceae297af4d3ee13f24a2b3ea764aa4c23f..7cc29027a61250074deddec49843cfd182157fdf 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_drv.c
+++ b/drivers/gpu/drm/qxl/qxl_drv.c
@@ -62,12 +62,67 @@ static struct pci_driver qxl_pci_driver;
 static int
 qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
+       struct drm_device *drm;
+       struct qxl_device *qdev;
+       int ret;
+
        if (pdev->revision < 4) {
                DRM_ERROR("qxl too old, doesn't support client_monitors_config,"
                          " use xf86-video-qxl in user mode");
                return -EINVAL; /* TODO: ENODEV ? */
        }
-       return drm_get_pci_dev(pdev, ent, &qxl_driver);
+
+       drm = drm_dev_alloc(&qxl_driver, &pdev->dev);
+       if (IS_ERR(drm))
+               return -ENOMEM;
+
+       qdev = kzalloc(sizeof(struct qxl_device), GFP_KERNEL);
+       if (!qdev) {
+               ret = -ENOMEM;
+               goto free_drm_device;
+       }
+
+       ret = pci_enable_device(pdev);
+       if (ret)
+               goto free_drm_device;
+
+       drm->pdev = pdev;
+       pci_set_drvdata(pdev, drm);
+       drm->dev_private = qdev;
+
+       ret = qxl_device_init(qdev, drm, pdev, ent->driver_data);
+       if (ret)
+               goto disable_pci;
+
+       ret = drm_vblank_init(drm, 1);
+       if (ret)
+               goto unload;
+
+       ret = qxl_modeset_init(qdev);
+       if (ret)
+               goto vblank_cleanup;
+
+       drm_kms_helper_poll_init(qdev->ddev);
+
+       /* Complete initialization. */
+       ret = drm_dev_register(drm, ent->driver_data);
+       if (ret)
+               goto modeset_cleanup;
+
+       return 0;
+
+modeset_cleanup:
+       qxl_modeset_fini(qdev);
+vblank_cleanup:
+       drm_vblank_cleanup(drm);
+unload:
+       qxl_device_fini(qdev);
+disable_pci:
+       pci_disable_device(pdev);
+free_drm_device:
+       kfree(qdev);
+       kfree(drm);
+       return ret;
 }
 
 static void
@@ -230,7 +285,6 @@ static struct pci_driver qxl_pci_driver = {
 static struct drm_driver qxl_driver = {
        .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME |
                           DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,
-       .load = qxl_driver_load,
        .unload = qxl_driver_unload,
        .get_vblank_counter = qxl_noop_get_vblank_counter,
        .enable_vblank = qxl_noop_enable_vblank,

diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
index 883d8639c04e57a82f81fbac081ac9fdbf586915..83201988394f48b3a1b467c041f4c245d7a25ed4 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -336,7 +336,10 @@ __printf(2,3) void qxl_io_log(struct qxl_device *qdev, const char *fmt, ...);
 extern const struct drm_ioctl_desc qxl_ioctls[];
 extern int qxl_max_ioctl;
 
-int qxl_driver_load(struct drm_device *dev, unsigned long flags);
+int qxl_device_init(struct qxl_device *qdev, struct drm_device *ddev,
+                   struct pci_dev *pdev,  unsigned long flags);
+void qxl_device_fini(struct qxl_device *qdev);
+
 void qxl_driver_unload(struct drm_device *dev);
 
 int qxl_modeset_init(struct qxl_device *qdev);
@@ -531,6 +534,7 @@ int qxl_garbage_collect(struct qxl_device *qdev);
 
 int qxl_debugfs_init(struct drm_minor *minor);
 void qxl_debugfs_takedown(struct drm_minor *minor);
+int qxl_ttm_debugfs_init(struct qxl_device *qdev);
 
 /* qxl_prime.c */
 int qxl_gem_prime_pin(struct drm_gem_object *obj);

diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c
index b2491407b616ef1728340306187ae4ffaec11564..6848057d0917e6e8bbb2d43a3a7907a71f61dd3c 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_kms.c
+++ b/drivers/gpu/drm/qxl/qxl_kms.c
@@ -115,7 +115,7 @@ static void qxl_gc_work(struct work_struct *work)
        qxl_garbage_collect(qdev);
 }
 
-static int qxl_device_init(struct qxl_device *qdev,
+int qxl_device_init(struct qxl_device *qdev,
                    struct drm_device *ddev,
                    struct pci_dev *pdev,
                    unsigned long flags)
@@ -263,7 +263,7 @@ static int qxl_device_init(struct qxl_device *qdev,
        return 0;
 }
 
-static void qxl_device_fini(struct qxl_device *qdev)
+void qxl_device_fini(struct qxl_device *qdev)
 {
        if (qdev->current_release_bo[0])
                qxl_bo_unref(&qdev->current_release_bo[0]);
@@ -300,39 +300,3 @@ void qxl_driver_unload(struct drm_device *dev)
        kfree(qdev);
        dev->dev_private = NULL;
 }
-
-int qxl_driver_load(struct drm_device *dev, unsigned long flags)
-{
-       struct qxl_device *qdev;
-       int r;
-
-       qdev = kzalloc(sizeof(struct qxl_device), GFP_KERNEL);
-       if (qdev == NULL)
-               return -ENOMEM;
-
-       dev->dev_private = qdev;
-
-       r = qxl_device_init(qdev, dev, dev->pdev, flags);
-       if (r)
-               goto out;
-
-       r = drm_vblank_init(dev, 1);
-       if (r)
-               goto unload;
-
-       r = qxl_modeset_init(qdev);
-       if (r)
-               goto unload;
-
-       drm_kms_helper_poll_init(qdev->ddev);
-
-       return 0;
-unload:
-       qxl_driver_unload(dev);
-
-out:
-       kfree(qdev);
-       return r;
-}
-
-

diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
index 1b096c5252ad731e96bacd417f4d4ee0dc2ab6cc..bc1c896bc5e1e623ebd2cb13c32857b93bde8f3f 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_ttm.c
+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
@@ -35,7 +35,6 @@
 #include "qxl_object.h"
 
 #include <linux/delay.h>
-static int qxl_ttm_debugfs_init(struct qxl_device *qdev);
 
 static struct qxl_device *qxl_get_qdev(struct ttm_bo_device *bdev)
 {
@@ -436,11 +435,6 @@ int qxl_ttm_init(struct qxl_device *qdev)
                 ((unsigned)num_io_pages * PAGE_SIZE) / (1024 * 1024));
        DRM_INFO("qxl: %uM of Surface memory size\n",
                 (unsigned)qdev->surfaceram_size / (1024 * 1024));
-       r = qxl_ttm_debugfs_init(qdev);
-       if (r) {
-               DRM_ERROR("Failed to init debugfs\n");
-               return r;
-       }
        return 0;
 }
 
@@ -473,7 +467,7 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
 }
 #endif
 
-static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
+int qxl_ttm_debugfs_init(struct qxl_device *qdev)
 {
 #if defined(CONFIG_DEBUG_FS)
        static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];