]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/nouveau: select FW caching
authorDave Airlie <airlied@redhat.com>
Fri, 7 Feb 2025 01:25:31 +0000 (11:25 +1000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Mar 2025 12:02:03 +0000 (13:02 +0100)
[ Upstream commit 6b481ab0e6855fb30e2923c51f62f1662d1cda7e ]

nouveau tries to load some firmware during suspend that it loaded
earlier, but with fw caching disabled it hangs suspend, so just rely on
FW cache enabling instead of working around it in the driver.

Fixes: 176fdcbddfd2 ("drm/nouveau/gsp/r535: add support for booting GSP-RM")
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20250207012531.621369-1-airlied@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/nouveau/Kconfig

index ce840300578d8a4011c448b61caf830cef3805bf..1050a4617fc15c13db994df7cdcdd29ba47b4ac6 100644 (file)
@@ -4,6 +4,7 @@ config DRM_NOUVEAU
        depends on DRM && PCI && MMU
        select IOMMU_API
        select FW_LOADER
+       select FW_CACHE if PM_SLEEP
        select DRM_CLIENT_SELECTION
        select DRM_DISPLAY_DP_HELPER
        select DRM_DISPLAY_HDMI_HELPER