drm/nouveau: use drm_dev_unplug() during device removal
authorJeremy Cline <jcline@redhat.com>
Wed, 25 Nov 2020 20:26:46 +0000 (15:26 -0500)
committerKarol Herbst <kherbst@redhat.com>
Thu, 4 Nov 2021 11:29:07 +0000 (12:29 +0100)
Nouveau does not currently support hot-unplugging, but it still makes
sense to switch from drm_dev_unregister() to drm_dev_unplug().
drm_dev_unplug() calls drm_dev_unregister() after marking the device as
unplugged, but only after any device critical sections are finished.

Since nouveau isn't using drm_dev_enter() and drm_dev_exit(), there are
no critical sections so this is nearly functionally equivalent. However,
the DRM layer does check to see if the device is unplugged, and if it is
returns appropriate error codes.

In the future nouveau can add critical sections in order to truly
support hot-unplugging.

Cc: stable@vger.kernel.org # 5.4+
Signed-off-by: Jeremy Cline <jcline@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Tested-by: Karol Herbst <kherbst@redhat.com>
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201125202648.5220-2-jcline@redhat.com
Link: https://gitlab.freedesktop.org/drm/nouveau/-/merge_requests/14
drivers/gpu/drm/nouveau/nouveau_drm.c

index 6109cd9e339918f5798787aad76cd3f1e69961f6..96490cc855cc993b30c12b0b263ade391a6ce469 100644 (file)
@@ -796,7 +796,7 @@ nouveau_drm_device_remove(struct drm_device *dev)
        struct nvkm_client *client;
        struct nvkm_device *device;
 
-       drm_dev_unregister(dev);
+       drm_dev_unplug(dev);
 
        client = nvxx_client(&drm->client.base);
        device = nvkm_device_find(client->device);