3 files changed, 12 insertions, 5 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
index 5f5be6368aed..c7a94c94dbf3 100644
--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
+++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
@@ -253,6 +253,9 @@ nouveau_backlight_init(struct drm_connector *connector)
         case NV_DEVICE_INFO_V0_FERMI:
         case NV_DEVICE_INFO_V0_KEPLER:
         case NV_DEVICE_INFO_V0_MAXWELL:
+        case NV_DEVICE_INFO_V0_PASCAL:
+        case NV_DEVICE_INFO_V0_VOLTA:
+        case NV_DEVICE_INFO_V0_TURING:
                 ret = nv50_backlight_init(nv_encoder, &props, &ops);
                 break;
         default:
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c b/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c
index 816ccaedfc73..8675613e142b 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/falcon.c
@@ -22,6 +22,7 @@
 #include <engine/falcon.h>
 
 #include <core/gpuobj.h>
+#include <subdev/mc.h>
 #include <subdev/timer.h>
 #include <engine/fifo.h>
 
@@ -107,8 +108,10 @@ nvkm_falcon_fini(struct nvkm_engine *engine, bool suspend)
                 }
         }
 
-        nvkm_mask(device, base + 0x048, 0x00000003, 0x00000000);
-        nvkm_wr32(device, base + 0x014, 0xffffffff);
+        if (nvkm_mc_enabled(device, engine->subdev.index)) {
+                nvkm_mask(device, base + 0x048, 0x00000003, 0x00000000);
+                nvkm_wr32(device, base + 0x014, 0xffffffff);
+        }
         return 0;
 }
 
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
index 3695cde669f8..07914e36939e 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
@@ -132,11 +132,12 @@ nvkm_therm_update(struct nvkm_therm *therm, int mode)
                         duty = nvkm_therm_update_linear(therm);
                         break;
                 case NVBIOS_THERM_FAN_OTHER:
-                        if (therm->cstate)
+                        if (therm->cstate) {
                                 duty = therm->cstate;
-                        else
+                                poll = false;
+                        } else {
                                 duty = nvkm_therm_update_linear_fallback(therm);
-                        poll = false;
+                        }
                         break;
                 }
                 immd = false;