Nouveau - Feb 2025 - [PATCH] drm/nouveau: select FW caching

From: Dave Airlie <airlied at redhat.com>

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 at redhat.com>
---
 drivers/gpu/drm/nouveau/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index ce840300578d8..1050a4617fc15 100644
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -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
-- 
2.48.1

(+ Luis, Russ)

On Fri, Feb 07, 2025 at 11:25:31AM +1000, Dave Airlie
wrote:
> From: Dave Airlie <airlied at redhat.com>
> 
> 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 at redhat.com>
> ---
>  drivers/gpu/drm/nouveau/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/nouveau/Kconfig
b/drivers/gpu/drm/nouveau/Kconfig
> index ce840300578d8..1050a4617fc15 100644
> --- a/drivers/gpu/drm/nouveau/Kconfig
> +++ b/drivers/gpu/drm/nouveau/Kconfig
> @@ -4,6 +4,7 @@ config DRM_NOUVEAU
>  	depends on DRM && PCI && MMU
>  	select IOMMU_API
>  	select FW_LOADER
> +	select FW_CACHE if PM_SLEEP
CONFIG_FW_CACHE was added, as the Kconfig says, it "can prevent suspend on
many
platforms".

@Luis, Russ: I assume this mostly means embedded platforms?

I wonder if we should not insist on FW_CACHE if NOUVEAU_PLATFORM_DRIVER, or even
only force FW_CACHE if DRM_NOUVEAU_GSP_DEFAULT?