]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/nouveau: Do not override forced connector status
authorThomas Zimmermann <tzimmermann@suse.de>
Tue, 14 Jan 2025 09:57:25 +0000 (10:57 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 22 Mar 2025 19:54:21 +0000 (12:54 -0700)
[ Upstream commit 01f1d77a2630e774ce33233c4e6723bca3ae9daa ]

Keep user-forced connector status even if it cannot be programmed. Same
behavior as for the rest of the drivers.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Lyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250114100214.195386-1-tzimmermann@suse.de
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/nouveau/nouveau_connector.c

index b06aa473102b30add29713ae4fdb9c509709bd40..5ab4201c981e470e92b8c54eb1b78ed6469e2277 100644 (file)
@@ -776,7 +776,6 @@ nouveau_connector_force(struct drm_connector *connector)
        if (!nv_encoder) {
                NV_ERROR(drm, "can't find encoder to force %s on!\n",
                         connector->name);
-               connector->status = connector_status_disconnected;
                return;
        }