From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 44FCE470121; Wed, 23 Sep 2026 14:26:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790173606; cv=none; b=Zl8JTByA+/bCTuJ7UC8V5lmNJ5z1V5wV6FWz1ynpT/q8CHuH3w5RKZhZIGAH6oye2mrIQJ4vJyN2cbVba8o8hoLt0dCdXIg2baXBT8HoafgNk5SMdybFfEropc65qtPKY3sNcX02bPHRDmG3nVwr07E7smcSlSeGBpUzdjcv/UM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790173606; c=relaxed/simple; bh=7SGwAKAIpkSb2p6PVX14DE8C9vDLDw3E3JYPyWJfZ4A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TMQJNjU3nxUaYzBOsdc663qElBoRvSwhG2XhyanPpKLVw6Wm8MjwakztoqbWR5s3cPXEqHuko2dSue97MgzafpyI4byS+RoyQF9ZZqLgrwRXhTXi7/smT0KhOgEit9NTT+UA+a7ZEnWo44/ddsHP4PHaO2HXPpaWHuotlouZZb4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Zo4OEN+w; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Zo4OEN+w" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 736A51F000FF; Wed, 23 Sep 2026 14:26:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790173605; bh=uw/aUrtdEoqsTPMEpXRXQW0PXopTjJTEHAhl1YeqVXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Zo4OEN+wcuie2e8c7ekL6y6aX93Qs5hoocmyFumKzM8IGJXKSfg8HV3Z37Jr1cUnz 4qLogTj7k7ffweo1R+z7GiKcicGPwmflTEHHBgij3mHBBP7mu1vAFaymnPD6s83lBC ql5jMaJWIKfprgqW6uF9P2dK9J6TeTrARVVvOO6k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lyude Paul , Dave Airlie Subject: [PATCH 7.2 255/438] drm/nouveau/gsp/r570: Set GcOff = 0 in fbsr Date: Wed, 23 Sep 2026 16:04:36 +0200 Message-ID: <20260923140651.379441696@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260923140644.756254324@linuxfoundation.org> References: <20260923140644.756254324@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.2-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lyude Paul commit 12f6eff11ccf9cad3b2dfcdd94184fdb9ffface2 upstream. Previously, it looked as if we were able to fix suspend/resume on some desktops by setting Gcoff based on whether or not we were entering runtime PM. This was a mistake though - the only time suspend/resume would end up actually working was if Gcoff = 0. It seems like it's likely the main reason for this is the FBSR GcOff argument actually controls GSP's behavior with regards to which buffers it decides to save across suspend/resume. When GcOff = 1, RM reserved regions are saved unless they are marked as LOST_ON_SUSPEND, and RM channel-context and kernel-client buffers are also saved -including- when they are LOST_ON_SUSPEND. This means with GcOff = 1, we end up having GSP save and restore buffers that actually need to be reinitialized on resume - causing the failures we're setting. Thanks to John Hubbard from Nvidia for providing some background on what these options do in the GSP firmware do! Signed-off-by: Lyude Paul Fixes: 53dac0623853 ("drm/nouveau/gsp: add support for 570.144") Cc: # v6.16+ Reviewed-by: Dave Airlie Link: https://patch.msgid.link/20260814194542.781955-3-lyude@redhat.com (cherry picked from commit c7abe771e013848970421e5ca29c6b2f05c31965) Signed-off-by: Lyude Paul Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/fbsr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/fbsr.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/fbsr.c @@ -81,7 +81,7 @@ r570_fbsr_init(struct nvkm_gsp *gsp, str ctrl->hClient = gsp->internal.client.object.handle; ctrl->hSysMem = memlist.handle; ctrl->sysmemAddrOfSuspendResumeData = gsp->sr.meta.addr; - ctrl->bEnteringGcoffState = 1; + ctrl->bEnteringGcoffState = 0; ret = nvkm_gsp_rm_ctrl_wr(&gsp->internal.device.subdevice, ctrl); if (ret)