diff --git a/drivers/gpu/drm/nouveau/include/nvif/class.h b/drivers/gpu/drm/nouveau/include/nvif/class.h
index e35988aa255b00bb670135bf5e248ca183f60921..157f59afa8bfa4162af636c5095bff6784ca696b 100644
--- a/drivers/gpu/drm/nouveau/include/nvif/class.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/class.h
@@ -132,7 +132,7 @@ struct nv_device_v0 {
 #define NV_DEVICE_V0_DISABLE_CE0                          0x0000008000000000ULL
 #define NV_DEVICE_V0_DISABLE_CE1                          0x0000010000000000ULL
 #define NV_DEVICE_V0_DISABLE_VIC                          0x0000020000000000ULL
-#define NV_DEVICE_V0_DISABLE_VENC                         0x0000040000000000ULL
+#define NV_DEVICE_V0_DISABLE_MSENC                        0x0000040000000000ULL
 #define NV_DEVICE_V0_DISABLE_CE2                          0x0000080000000000ULL
 #define NV_DEVICE_V0_DISABLE_MSVLD                        0x0000100000000000ULL
 #define NV_DEVICE_V0_DISABLE_SEC                          0x0000200000000000ULL
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
index 1a6a49c7f84bfff705568e7794e0f8d7899feef4..ddc3d5d498173d83b020db150dd06ed38b9652db 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
@@ -56,7 +56,7 @@ enum nv_subdev_type {
 	NVDEV_ENGINE_CE1,
 	NVDEV_ENGINE_CE2,
 	NVDEV_ENGINE_VIC,
-	NVDEV_ENGINE_VENC,
+	NVDEV_ENGINE_MSENC,
 	NVDEV_ENGINE_DISP,
 	NVDEV_ENGINE_PM,
 	NVDEV_ENGINE_MSVLD,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index fda8d729aa307b885f6b9ffbccb7550faf45132a..60f538976f3b31d02f4b2598a1ab9e83a9d5c062 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -239,7 +239,7 @@ static const u64 disable_map[] = {
 	[NVDEV_ENGINE_CE1]	= NV_DEVICE_V0_DISABLE_CE1,
 	[NVDEV_ENGINE_CE2]	= NV_DEVICE_V0_DISABLE_CE2,
 	[NVDEV_ENGINE_VIC]	= NV_DEVICE_V0_DISABLE_VIC,
-	[NVDEV_ENGINE_VENC]	= NV_DEVICE_V0_DISABLE_VENC,
+	[NVDEV_ENGINE_MSENC]	= NV_DEVICE_V0_DISABLE_MSENC,
 	[NVDEV_ENGINE_DISP]	= NV_DEVICE_V0_DISABLE_DISP,
 	[NVDEV_ENGINE_MSVLD]	= NV_DEVICE_V0_DISABLE_MSVLD,
 	[NVDEV_ENGINE_SEC]	= NV_DEVICE_V0_DISABLE_SEC,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nve0.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nve0.c
index 81dc280c0022e35a8cb82defa615f78785c30fb0..ea31e2de3eabb442d15d9269566d946f85950956 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nve0.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nve0.c
@@ -53,7 +53,7 @@ static const struct {
 	_(NVDEV_ENGINE_MSVLD   , 0),
 	_(NVDEV_ENGINE_CE0     , 0),
 	_(NVDEV_ENGINE_CE1     , 0),
-	_(NVDEV_ENGINE_VENC    , 0),
+	_(NVDEV_ENGINE_MSENC   , 0),
 };
 #undef _
 #define FIFO_ENGINE_NR ARRAY_SIZE(fifo_engine)
@@ -421,7 +421,7 @@ nve0_fifo_engidx(struct nve0_fifo_priv *priv, u32 engn)
 	case NVDEV_ENGINE_VP   : engn = 3; break;
 	case NVDEV_ENGINE_CE0  : engn = 4; break;
 	case NVDEV_ENGINE_CE1  : engn = 5; break;
-	case NVDEV_ENGINE_VENC : engn = 6; break;
+	case NVDEV_ENGINE_MSENC: engn = 6; break;
 	default:
 		return -1;
 	}
@@ -626,7 +626,7 @@ nve0_fifo_fault_engine[] = {
 	{ 0x15, "CE0", NULL, NVDEV_ENGINE_CE0 },
 	{ 0x16, "CE1", NULL, NVDEV_ENGINE_CE1 },
 	{ 0x17, "PMU" },
-	{ 0x19, "MSENC", NULL, NVDEV_ENGINE_VENC },
+	{ 0x19, "MSENC", NULL, NVDEV_ENGINE_MSENC },
 	{ 0x1b, "CE2", NULL, NVDEV_ENGINE_CE2 },
 	{}
 };
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nvc0.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nvc0.c
index 4fbe8e9c97f04ca2e3ee2b2fe03c5a86cb4b4160..4ad22a48ff3a8c5b181c2526c10c0c993b24ede0 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nvc0.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nvc0.c
@@ -77,7 +77,7 @@ nvc0_devinit_disable(struct nouveau_devinit *devinit)
 	if (r022500 & 0x00000004)
 		disable |= (1ULL << NVDEV_ENGINE_MSVLD);
 	if (r022500 & 0x00000008)
-		disable |= (1ULL << NVDEV_ENGINE_VENC);
+		disable |= (1ULL << NVDEV_ENGINE_MSENC);
 	if (r022500 & 0x00000100)
 		disable |= (1ULL << NVDEV_ENGINE_CE0);
 	if (r022500 & 0x00000200)