Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 40F0CCA0ED1 for ; Mon, 11 Aug 2025 21:39:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7BCE010E555; Mon, 11 Aug 2025 21:39:08 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=darkrefraction-com.20230601.gappssmtp.com header.i=@darkrefraction-com.20230601.gappssmtp.com header.b="hN8GktFA"; dkim-atps=neutral Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4EA1A10E555 for ; Mon, 11 Aug 2025 21:39:07 +0000 (UTC) Received: by mail-qv1-f48.google.com with SMTP id 6a1803df08f44-70744e8ed6eso40730336d6.2 for ; Mon, 11 Aug 2025 14:39:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darkrefraction-com.20230601.gappssmtp.com; s=20230601; t=1754948346; x=1755553146; darn=lists.freedesktop.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7cmh9zZEdqiV3NmqqAUhDgNdsvYT/9RhKyW5oIISWXc=; b=hN8GktFAQ9YkY76geCOwmuOuesZmJ337On7nITsNEYjITcj0x4NKo99vzs5KHloV3O JQM09uUzx2zUsmIco48POky8oG482I3z0ph751LfruMbM5g9IikV2HLz83QrbiLiTsI0 4w9Opy5nJERcFMVAj0Ht1Px7zNLFtZTnQEZWemQ24EzY7TeRtHVF9ObI3D5x4xhJ6fN8 pPQ0zgZiMwNG986lxr+zpDNEK1iSaOoFBK3Q/NWRUuh6NRas6QcEhi7rUcK5aE/DeYrW zuDbVni/ETf5gm3vzJRIvK0bIuQJ8DaF4nUocdr0Unq/6aEfBsr5/5Kb5eAh2b3jAPEy dbrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754948346; x=1755553146; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7cmh9zZEdqiV3NmqqAUhDgNdsvYT/9RhKyW5oIISWXc=; b=qHNZN4TINl4A3e7cBmo4gTUapQC/q/ZYRSvoHv/cxgKn89Uzp87Y0eY8LDvXv6nVDa ziy1SjEH9oy8utOmH8BOloFSP7Ihr2aiLMBWrOrGZsvh42lHdUSC2FuEFu1Re6fb+hpa JAg/FLYiNNycKOgZsVSoyqIbdIhZ5sGlzUBqbIrroD1v7audAMlh7IhkRmEyl3VM8JfF vvE3uHTfipSvzeSnqXZTFugKtd1HQk9zb7QKYECCpW13AyjC+uqcEru/Ho9FEi15ijW+ /1MTMukl70pQYSGzOIeBcm1a/JZhB7ZM/NoLYFf/bNKtn+fP1KX4doacKItUbk8X/bTG jTjA== X-Forwarded-Encrypted: i=1; AJvYcCVmobiupkb8wUOjasgmXoI93ggiYd+S2ouwlXDtSrshrSKaKT7nTI4DeiGW3JpP3m3qUubR4BJKyjc=@lists.freedesktop.org X-Gm-Message-State: AOJu0Yxd0NnFl5PJIUu014a4vdXHariaWxxhTPJHprCqjCKsbg4ZCOOT t4nP4jocqlCKv+ODF8bcVUM8Brd2YKnI+0g697xO9r6ynZgh8wDlNs/oi8jC7XjJsFw= X-Gm-Gg: ASbGncv+ZidShzr8DVDK6VOCywfhJgZQKQHLgOwdgZxAn2QaaXvMz9m9KfsdJ5y5C1P 7Pbny2VLOl+PNnJzeOwW9MwHocoT7u00ECeuHZdBrMVWBLL6tUbVoRPL+MmwnbUt1oyG29nMayY Fma/uHc4Wv8n3l7dyAjlzqgKS/XXnua17+aNIYcs1CaI8cixGoqw6A1eQkNcZyhQzYRQFfJo4IK a6dE1Gfcp6QCwoxfuaqedWe75EOcWPsGvhV2MDDeAeq4kWHK96LfRn3vz3JPoFAAczMrhABx2Jf 6fJ4UDhmaVoSUeIVz1IIuhxoNDtVd2ehDAvMxenDPxO+th7ofGdjXaXkSjFil8vKY5l9r0uPelq U6M9YlHv13enbHs0PNl+IscMhkUKQsVB7YbHRKcNynsojnKj0ixX2DIayKzMEhVxzhbS17Lk+5/ fv0r3XpoMAiPohG/4= X-Google-Smtp-Source: AGHT+IGRoeaO9O+qk/W9QptasfYz+/nbhpKM+4WgmkKbkhdulQI095MnF1uSmFsRzxpH9JvpOpQ7cw== X-Received: by 2002:a05:6214:b65:b0:707:56a4:5b56 with SMTP id 6a1803df08f44-709d5eba2b9mr21027726d6.40.1754948345817; Mon, 11 Aug 2025 14:39:05 -0700 (PDT) Received: from m-kiwi.verizon.net (pool-108-18-253-193.washdc.fios.verizon.net. [108.18.253.193]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-7077ca1d5ecsm163097136d6.26.2025.08.11.14.39.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Aug 2025 14:39:05 -0700 (PDT) From: Mel Henning To: Karol Herbst , Lyude Paul , Danilo Krummrich , Faith Ekstrand , ttabi@nvidia.com, bskeggs@nvidia.com, martin.peres@free.fr, dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org Cc: Mel Henning Subject: [PATCH 3/3] drm/nouveau: Improve message for missing firmware Date: Mon, 11 Aug 2025 17:32:33 -0400 Message-ID: <20250811213843.4294-4-mhenning@darkrefraction.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250811213843.4294-1-mhenning@darkrefraction.com> References: <20250811213843.4294-1-mhenning@darkrefraction.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This is inteded to address concerns that users might get cryptic error messages or a failure to boot if they set nouveau.config=NvGspRm=0 on the kernel command line and their gpu requires gsp (Ada or newer). With this patch, that configuration results in error messages like this: nouveau 0000:01:00.0: gsp: Failed to load required firmware for device. nouveau 0000:01:00.0: gsp ctor failed: -22 nouveau 0000:01:00.0: probe with driver nouveau failed with error -22 When nouveau fails to load like this, we still fall back to the generic framebuffer device, so users will still have limited graphical output. Signed-off-by: Mel Henning --- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/base.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/base.c index d23243a83a4c..7ccb41761066 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/base.c @@ -138,8 +138,10 @@ nvkm_gsp_new_(const struct nvkm_gsp_fwif *fwif, struct nvkm_device *device, nvkm_subdev_ctor(&nvkm_gsp, device, type, inst, &gsp->subdev); fwif = nvkm_firmware_load(&gsp->subdev, fwif, "Gsp", gsp); - if (IS_ERR(fwif)) + if (IS_ERR(fwif)) { + nvkm_error(&gsp->subdev, "Failed to load required firmware for device."); return PTR_ERR(fwif); + } gsp->func = fwif->func; -- 2.50.1