Skip to content

Commit aff2299

Browse files
jeremyclinekarolherbst
authored andcommitted
drm/nouveau: use drm_dev_unplug() during device removal
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
1 parent 6bb8c2d commit aff2299

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/gpu/drm/nouveau/nouveau_drm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ nouveau_drm_device_remove(struct drm_device *dev)
796796
struct nvkm_client *client;
797797
struct nvkm_device *device;
798798

799-
drm_dev_unregister(dev);
799+
drm_dev_unplug(dev);
800800

801801
client = nvxx_client(&drm->client.base);
802802
device = nvkm_device_find(client->device);

0 commit comments

Comments
 (0)