From mboxrd@z Thu Jan 1 00:00:00 1970 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 6808ACA0EC4 for ; Mon, 11 Aug 2025 21:39:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B5D9110E551; Mon, 11 Aug 2025 21:39:03 +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="xhcBAhyP"; dkim-atps=neutral Received: from mail-qv1-f47.google.com (mail-qv1-f47.google.com [209.85.219.47]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6D26610E550 for ; Mon, 11 Aug 2025 21:39:02 +0000 (UTC) Received: by mail-qv1-f47.google.com with SMTP id 6a1803df08f44-707453b0306so49218296d6.2 for ; Mon, 11 Aug 2025 14:39:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darkrefraction-com.20230601.gappssmtp.com; s=20230601; t=1754948341; x=1755553141; 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=MLFY/gPsJryxB7dKnCFP91YGCa6bmOw593PDTexR7mY=; b=xhcBAhyPHAgpTtXMQ7cjvfJ0Nsqi7VqkAYzv6ahd+dEs8X4o/N+Ud1pyeYuZIUnBA1 QXSWY2FlWaT2+WtAAwyj52bro02p/AAEFAccc8dnBSqR5NN+WCi8YeF/mR44cuj4iML7 SIVVypz9jrgMmNrh1YKxBz9fSKqLwMJ1AlR78vSRvFx0synQzwDpniRIrQTaUGWtuvZN e7KIthCZh1Q7bqUIPY2bmKUYsKju5V4JGp7/0GuEqTISBMOoF+nh8BByccg8TEgovBGX biOTHn6a1/1YTVIJ9ouBTGAKMLMtzppqlYO3uGl1Rx/tRGeKHPEkaKzNRJYmU+9tsbbm Z8gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754948341; x=1755553141; 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=MLFY/gPsJryxB7dKnCFP91YGCa6bmOw593PDTexR7mY=; b=cYpWTr1Fnq7HnPdI0vZzPuQoKLPqe7vDtkyFOWuz26G21yPASL0LBu51/Uym0p6fsP 768i4nbEygEG3Zsv5OEFGRy8iEj42hF8BccJSYj7/elwEuzScxrhR7l7TpQHejq+Hsc7 S/eTWaYewUpAMmB6IXgiX+rVGjrLatsznjyPmrNNT9V9kPh9zOmyUbT8MYrteVT+i+Xk XCKaWSaJTAPAhn1HWp+ZDfi+7E6jxanxpAZtv9UF5fXDXAw7dyyq6Mqzt53noRQr6q6e G3fpehM55NMcL91TNcY6pp8qKLbPDJODJih7xQm/LedksBtcVLd98sBSgZ2dhJxJbWwH grvg== X-Forwarded-Encrypted: i=1; AJvYcCWQYoiC5xsm5PMU3/AP102UnWcfJ8bMMzQFsu5NcLXkTLeyqa/ht0g7Shw81dZgVfTCC450lDmu@lists.freedesktop.org X-Gm-Message-State: AOJu0YwqHRco4277U/ab4OKG78oQVf341Va/sLY2raVq1AkfH2BXPVOa A24P6yeHu29Vk7n1WOP3jywH0NSGEzmH4iTtvfISTWEgnJamBjsvzGhn5kuzdUdHkUY= X-Gm-Gg: ASbGncsGA7457m2h1sn4IGN4T2ytKPwRr7w5md0VYt55PaESEt/VNEsxaFCoKqjXcq3 kcxObV7Z36kfQKDwNTSc4FKWltfXLBQBw0VnRZlewBuQtvY95351UU8zx8DgNUjCMusOdEXK8kB Claylu0gbhksbC9ZQkvHHzRQztKVVBSnn/jHDIDsm3abbU7YVd9MMqVBAa9qznl/rQvtfS3E2J0 nrIB67Wnt21x+XvAVIKO7cBZ2IIq5Qfn873ji3aFlmlfnrYrW/ixg/HEDhuUmS91GiAwibX/D3R w0uglQqOLzD2ynjsRATfQ21Ot+c0nmgZ4sd+es2TOhrch7TsBICxt7DTY6uVlNQ6rIDLTbFz1RB mX1ZKbe/COEJeKb70fRihyj1VSgXqmReJ+nvjwpsXzbNBnML7dSGmjJbqXavyJJgbcKrjbwJcVC h55FHGsp3OyES56xQ= X-Google-Smtp-Source: AGHT+IENqR2pPqRpqpwA8UKhF74Kc3nviYN8IzC81o2Q+EZxLrJNUKFfStyDY1OIaplNcbt3vkGisQ== X-Received: by 2002:a05:6214:cac:b0:707:4710:a551 with SMTP id 6a1803df08f44-7099a3d0150mr177690126d6.46.1754948341327; Mon, 11 Aug 2025 14:39:01 -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.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Aug 2025 14:39:00 -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 1/3] drm/nouveau: Remove DRM_NOUVEAU_GSP_DEFAULT config Date: Mon, 11 Aug 2025 17:32:31 -0400 Message-ID: <20250811213843.4294-2-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: nouveau@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Nouveau development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" This option was originally intoduced because the GSP code path was not well tested and we wanted to leave it up to distros which code path they shipped by default. By now though, the GSP path is probably better tested than the old firmware eg. Fedora ships GSP by default and we generally run CTS on GSP. We've always been GSP-only on Ada and later. So, this path removes the option and effectively sets the option to always on. We still fall back to the old firmware if GSP is not found. This change only affects Turing and Ampere. Users can still set nouveau.config=NvGspRm=0 on the kernel command line to force using the old firmware on Turing/Ampere. Signed-off-by: Mel Henning Reviewed-by: Ben Skeggs --- drivers/gpu/drm/nouveau/Kconfig | 8 -------- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c | 6 +----- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig index d1587639ebb0..c88776d1e784 100644 --- a/drivers/gpu/drm/nouveau/Kconfig +++ b/drivers/gpu/drm/nouveau/Kconfig @@ -102,14 +102,6 @@ config DRM_NOUVEAU_SVM Say Y here if you want to enable experimental support for Shared Virtual Memory (SVM). -config DRM_NOUVEAU_GSP_DEFAULT - bool "Use GSP firmware for Turing/Ampere (needs firmware installed)" - depends on DRM_NOUVEAU - default n - help - Say Y here if you want to use the GSP codepaths by default on - Turing and Ampere GPUs. - config DRM_NOUVEAU_CH7006 tristate "Chrontel ch7006 TV encoder" depends on DRM_NOUVEAU diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c index 58e233bc53b1..81e56da0474a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c @@ -383,13 +383,9 @@ int tu102_gsp_load_rm(struct nvkm_gsp *gsp, const struct nvkm_gsp_fwif *fwif) { struct nvkm_subdev *subdev = &gsp->subdev; - bool enable_gsp = fwif->enable; int ret; -#if IS_ENABLED(CONFIG_DRM_NOUVEAU_GSP_DEFAULT) - enable_gsp = true; -#endif - if (!nvkm_boolopt(subdev->device->cfgopt, "NvGspRm", enable_gsp)) + if (!nvkm_boolopt(subdev->device->cfgopt, "NvGspRm", true)) return -EINVAL; ret = nvkm_gsp_load_fw(gsp, "gsp", fwif->ver, &gsp->fws.rm); -- 2.50.1