2 files changed, 19 insertions, 5 deletions

diff --git a/drivers/gpu/drm/nouveau/core/core/engine.c b/drivers/gpu/drm/nouveau/core/core/engine.c
index c8bed4a26833..1f6954ae9dd3 100644
--- a/drivers/gpu/drm/nouveau/core/core/engine.c
+++ b/drivers/gpu/drm/nouveau/core/core/engine.c
@@ -42,11 +42,24 @@ nouveau_engine_create_(struct nouveau_object *parent,
         if (ret)
                 return ret;
 
-        if ( parent &&
-            !nouveau_boolopt(nv_device(parent)->cfgopt, iname, enable)) {
-                if (!enable)
-                        nv_warn(engine, "disabled, %s=1 to enable\n", iname);
-                return -ENODEV;
+        if (parent) {
+                struct nouveau_device *device = nv_device(parent);
+                int engidx = nv_engidx(nv_object(engine));
+
+                if (device->disable_mask & (1ULL << engidx)) {
+                        if (!nouveau_boolopt(device->cfgopt, iname, false)) {
+                                nv_debug(engine, "engine disabled by hw/fw\n");
+                                return -ENODEV;
+                        }
+
+                        nv_warn(engine, "ignoring hw/fw engine disable\n");
+                }
+
+                if (!nouveau_boolopt(device->cfgopt, iname, enable)) {
+                        if (!enable)
+                                nv_warn(engine, "disabled, %s=1 to enable\n", iname);
+                        return -ENODEV;
+                }
         }
 
         INIT_LIST_HEAD(&engine->contexts);
diff --git a/drivers/gpu/drm/nouveau/core/include/core/device.h b/drivers/gpu/drm/nouveau/core/include/core/device.h
index 24809c10b4b3..7b8ea221b00d 100644
--- a/drivers/gpu/drm/nouveau/core/include/core/device.h
+++ b/drivers/gpu/drm/nouveau/core/include/core/device.h
@@ -71,6 +71,7 @@ struct nouveau_device {
         const char *dbgopt;
         const char *name;
         const char *cname;
+        u64 disable_mask;
 
         enum {
                 NV_04    = 0x04,