drm/nouveau: move allocation of root client out of nouveau_cli_init()

drm->master isn't really a nouveau_cli, and is mostly just used to get
at an nvif_mmu object to implement a hack around issues with the ioctl
interface to nvkm.

Later patches in this series allocate nvif_device/mmu objects in
nouveau_drm directly, removing the need for master.

A pending series to remove the "ioctl" layer between DRM and NVKM
removes the need for the above-mentioned hack entirely.

The only other member of drm->master that's needed is the nvif_client,
and is a dependency of device/mmu.  So the first step is to move its
allocation out of code handling nouveau_cli init.

v2:
- modified slightly due to the addition of tegra/pci cleanup patches
v3:
- move nvif init below drm_dev_alloc() to avoid changing nouveau_name()

Signed-off-by: Ben Skeggs <bskeggs@nvidia.com>
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240726043828.58966-7-bskeggs@nvidia.com

diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 140e27af0d649b87d4e1dc0730feafd6d35070be..eb154b44c15465d7b321823e6d83e8d7ac57aece 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -209,9 +209,11 @@ nouveau_cli_fini(struct nouveau_cli *cli)
        nouveau_vmm_fini(&cli->vmm);
        nvif_mmu_dtor(&cli->mmu);
        nvif_device_dtor(&cli->device);
-       mutex_lock(&cli->drm->master.lock);
-       nvif_client_dtor(&cli->base);
-       mutex_unlock(&cli->drm->master.lock);
+       if (cli != &cli->drm->master) {
+               mutex_lock(&cli->drm->master.lock);
+               nvif_client_dtor(&cli->base);
+               mutex_unlock(&cli->drm->master.lock);
+       }
 }
 
 static int
@@ -253,10 +255,7 @@ nouveau_cli_init(struct nouveau_drm *drm, const char *sname,
        INIT_LIST_HEAD(&cli->worker);
        mutex_init(&cli->lock);
 
-       if (cli == &drm->master) {
-               ret = nvif_driver_init(NULL, nouveau_config, nouveau_debug,
-                                      cli->name, device, &cli->base);
-       } else {
+       if (cli != &drm->master) {
                mutex_lock(&drm->master.lock);
                ret = nvif_client_ctor(&drm->master.base, cli->name, device,
                                       &cli->base);
@@ -626,7 +625,6 @@ nouveau_drm_device_fini(struct nouveau_drm *drm)
        nouveau_cli_fini(&drm->client);
        nouveau_cli_fini(&drm->master);
        destroy_workqueue(drm->sched_wq);
-       nvif_parent_dtor(&drm->parent);
        mutex_destroy(&drm->clients_lock);
 }
 
@@ -636,15 +634,10 @@ nouveau_drm_device_init(struct nouveau_drm *drm)
        struct drm_device *dev = drm->dev;
        int ret;
 
-       nvif_parent_ctor(&nouveau_parent, &drm->parent);
-       drm->master.base.object.parent = &drm->parent;
-
        drm->sched_wq = alloc_workqueue("nouveau_sched_wq_shared", 0,
                                        WQ_MAX_ACTIVE);
-       if (!drm->sched_wq) {
-               ret = -ENOMEM;
-               goto fail_alloc;
-       }
+       if (!drm->sched_wq)
+               return -ENOMEM;
 
        ret = nouveau_cli_init(drm, "DRM-master", &drm->master);
        if (ret)
@@ -726,8 +719,6 @@ fail_master:
        nouveau_cli_fini(&drm->master);
 fail_wq:
        destroy_workqueue(drm->sched_wq);
-fail_alloc:
-       nvif_parent_dtor(&drm->parent);
        return ret;
 }
 
@@ -737,6 +728,9 @@ nouveau_drm_device_del(struct nouveau_drm *drm)
        if (drm->dev)
                drm_dev_put(drm->dev);
 
+       nvif_client_dtor(&drm->master.base);
+       nvif_parent_dtor(&drm->parent);
+
        kfree(drm);
 }
 
@@ -762,6 +756,14 @@ nouveau_drm_device_new(const struct drm_driver *drm_driver, struct device *paren
        drm->dev->dev_private = drm;
        dev_set_drvdata(parent, drm);
 
+       nvif_parent_ctor(&nouveau_parent, &drm->parent);
+       drm->master.base.object.parent = &drm->parent;
+
+       ret = nvif_driver_init(NULL, nouveau_config, nouveau_debug, "drm",
+                              nouveau_name(drm->dev), &drm->master.base);
+       if (ret)
+               goto done;
+
 done:
        if (ret) {
                nouveau_drm_device_del(drm);