]> 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>
Thu, 10 Apr 2025 12:31:51 +0000 (14:31 +0200)
[ 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 ac9eb92059bc3eb14ce4ab6befd24e4cd5fe774a..30f871be52cb3830dd5577eeee50e427ed80f519 100644 (file)
@@ -754,7 +754,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;
        }