drm/nouveau/msvld: namespace + nvidia gpu names (no binary change)
authorBen Skeggs <bskeggs@redhat.com>
Wed, 14 Jan 2015 05:30:40 +0000 (15:30 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Thu, 22 Jan 2015 02:18:04 +0000 (12:18 +1000)
The namespace of NVKM is being changed to nvkm_ instead of nouveau_,
which will be used for the DRM part of the driver.  This is being
done in order to make it very clear as to what part of the driver a
given symbol belongs to, and as a minor step towards splitting the
DRM driver out to be able to stand on its own (for virt).

Because there's already a large amount of churn here anyway, this is
as good a time as any to also switch to NVIDIA's device and chipset
naming to ease collaboration with them.

A comparison of objdump disassemblies proves no code changes.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
12 files changed:
drivers/gpu/drm/nouveau/include/nvkm/engine/msvld.h
drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c
drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c
drivers/gpu/drm/nouveau/nvkm/engine/device/nvc0.c
drivers/gpu/drm/nouveau/nvkm/engine/device/nve0.c
drivers/gpu/drm/nouveau/nvkm/engine/msvld/Kbuild
drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/nvkm/engine/msvld/nv98.c [deleted file]
drivers/gpu/drm/nouveau/nvkm/engine/msvld/nvc0.c [deleted file]
drivers/gpu/drm/nouveau/nvkm/engine/msvld/nve0.c [deleted file]

index f031bb9de74c0c06fe1869534620e7fc4a339633..1f193b7bd6c50c917e87a708bd2b94553c859384 100644 (file)
@@ -1,6 +1,7 @@
 #ifndef __NVKM_MSVLD_H__
 #define __NVKM_MSVLD_H__
-extern struct nouveau_oclass nv98_msvld_oclass;
-extern struct nouveau_oclass nvc0_msvld_oclass;
-extern struct nouveau_oclass nve0_msvld_oclass;
+#include <core/engine.h>
+extern struct nvkm_oclass g98_msvld_oclass;
+extern struct nvkm_oclass gf100_msvld_oclass;
+extern struct nvkm_oclass gk104_msvld_oclass;
 #endif
index a5a9c8bf8f0d42e5f00d93358de23406fb0f4f9b..4c45f57e81d4bd2619bb703c9af45095d9e76d43 100644 (file)
@@ -94,7 +94,7 @@ gm100_identify(struct nouveau_device *device)
 #endif
                device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;
 #if 0
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;
 #endif
@@ -137,7 +137,7 @@ gm100_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_CE0    ] = &gm204_ce0_oclass;
                device->oclass[NVDEV_ENGINE_CE1    ] = &gm204_ce1_oclass;
                device->oclass[NVDEV_ENGINE_CE2    ] = &gm204_ce2_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;
 #endif
index a7838a7c19011cd4036c59b73010b0d7cc723b21..ef87c7ec5812d265220d53f385bd8359bea8611e 100644 (file)
@@ -256,7 +256,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &g98_mspdec_oclass;
                device->oclass[NVDEV_ENGINE_SEC    ] = &nv98_sec_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &g98_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &g98_msppp_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  g94_disp_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;
@@ -314,7 +314,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &g98_mspdec_oclass;
                device->oclass[NVDEV_ENGINE_SEC    ] = &nv98_sec_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &g98_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &g98_msppp_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  g94_disp_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;
@@ -343,7 +343,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &g98_mspdec_oclass;
                device->oclass[NVDEV_ENGINE_SEC    ] = &nv98_sec_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &g98_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &g98_msppp_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  g94_disp_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;
@@ -373,7 +373,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &g84_mpeg_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &g98_mspdec_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &g98_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &g98_msppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &gt215_ce_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;
@@ -403,7 +403,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &g98_mspdec_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &g98_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &g98_msppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &gt215_ce_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;
@@ -433,7 +433,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &g98_mspdec_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &g98_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &g98_msppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &gt215_ce_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;
@@ -463,7 +463,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &g98_mspdec_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &g98_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &g98_msppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &gt215_ce_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;
index 83dd982b1c4c4174ab1c88d478ec95a2aa2afd5b..c8ac22e98c879fd21dd28bb3240be78b3123dd32 100644 (file)
@@ -85,7 +85,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  gf100_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &gf100_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;
                device->oclass[NVDEV_ENGINE_CE1    ] = &gf100_ce1_oclass;
@@ -118,7 +118,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  gf104_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &gf100_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;
                device->oclass[NVDEV_ENGINE_CE1    ] = &gf100_ce1_oclass;
@@ -151,7 +151,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  gf104_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &gf100_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;
@@ -183,7 +183,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  gf104_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &gf100_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;
                device->oclass[NVDEV_ENGINE_CE1    ] = &gf100_ce1_oclass;
@@ -216,7 +216,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  gf104_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &gf100_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;
@@ -248,7 +248,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  gf108_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &gf100_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  gt215_disp_oclass;
@@ -280,7 +280,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  gf110_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &gf100_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;
                device->oclass[NVDEV_ENGINE_CE1    ] = &gf100_ce1_oclass;
@@ -313,7 +313,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  gf119_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &gf100_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  gf110_disp_oclass;
@@ -343,7 +343,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  gf117_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &gf100_mspdec_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nvc0_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &gf100_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &gf100_ce0_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  gf110_disp_oclass;
index 5676a0251c7903655ec58c78836433a3e469bff9..d0894674be447e450a8e992b14e06a5e7c8abfc2 100644 (file)
@@ -88,7 +88,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_CE0    ] = &gk104_ce0_oclass;
                device->oclass[NVDEV_ENGINE_CE1    ] = &gk104_ce1_oclass;
                device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;
@@ -122,7 +122,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_CE0    ] = &gk104_ce0_oclass;
                device->oclass[NVDEV_ENGINE_CE1    ] = &gk104_ce1_oclass;
                device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;
@@ -156,7 +156,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_CE0    ] = &gk104_ce0_oclass;
                device->oclass[NVDEV_ENGINE_CE1    ] = &gk104_ce1_oclass;
                device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;
@@ -212,7 +212,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_CE0    ] = &gk104_ce0_oclass;
                device->oclass[NVDEV_ENGINE_CE1    ] = &gk104_ce1_oclass;
                device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] = &nvf0_pm_oclass;
@@ -246,7 +246,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_CE0    ] = &gk104_ce0_oclass;
                device->oclass[NVDEV_ENGINE_CE1    ] = &gk104_ce1_oclass;
                device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] = &nvf0_pm_oclass;
@@ -280,7 +280,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_CE0    ] = &gk104_ce0_oclass;
                device->oclass[NVDEV_ENGINE_CE1    ] = &gk104_ce1_oclass;
                device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;
                break;
@@ -313,7 +313,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_CE0    ] = &gk104_ce0_oclass;
                device->oclass[NVDEV_ENGINE_CE1    ] = &gk104_ce1_oclass;
                device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;
-               device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;
+               device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;
                break;
index 1deb463a2b0b61ff9e57252c2501612949a2dca0..0c9811009e289f34c9336df408d80e22cf0f0383 100644 (file)
@@ -1,3 +1,3 @@
-nvkm-y += nvkm/engine/msvld/nv98.o
-nvkm-y += nvkm/engine/msvld/nvc0.o
-nvkm-y += nvkm/engine/msvld/nve0.o
+nvkm-y += nvkm/engine/msvld/g98.o
+nvkm-y += nvkm/engine/msvld/gf100.o
+nvkm-y += nvkm/engine/msvld/gk104.o
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c
new file mode 100644 (file)
index 0000000..c8a6b4e
--- /dev/null
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2012 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Ben Skeggs, Maarten Lankhorst, Ilia Mirkin
+ */
+#include <engine/msvld.h>
+#include <engine/falcon.h>
+
+struct g98_msvld_priv {
+       struct nvkm_falcon base;
+};
+
+/*******************************************************************************
+ * MSVLD object classes
+ ******************************************************************************/
+
+static struct nvkm_oclass
+g98_msvld_sclass[] = {
+       { 0x88b1, &nvkm_object_ofuncs },
+       { 0x85b1, &nvkm_object_ofuncs },
+       { 0x86b1, &nvkm_object_ofuncs },
+       {},
+};
+
+/*******************************************************************************
+ * PMSVLD context
+ ******************************************************************************/
+
+static struct nvkm_oclass
+g98_msvld_cclass = {
+       .handle = NV_ENGCTX(MSVLD, 0x98),
+       .ofuncs = &(struct nvkm_ofuncs) {
+               .ctor = _nvkm_falcon_context_ctor,
+               .dtor = _nvkm_falcon_context_dtor,
+               .init = _nvkm_falcon_context_init,
+               .fini = _nvkm_falcon_context_fini,
+               .rd32 = _nvkm_falcon_context_rd32,
+               .wr32 = _nvkm_falcon_context_wr32,
+       },
+};
+
+/*******************************************************************************
+ * PMSVLD engine/subdev functions
+ ******************************************************************************/
+
+static int
+g98_msvld_init(struct nvkm_object *object)
+{
+       struct g98_msvld_priv *priv = (void *)object;
+       int ret;
+
+       ret = nvkm_falcon_init(&priv->base);
+       if (ret)
+               return ret;
+
+       nv_wr32(priv, 0x084010, 0x0000ffd2);
+       nv_wr32(priv, 0x08401c, 0x0000fff2);
+       return 0;
+}
+
+static int
+g98_msvld_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
+              struct nvkm_oclass *oclass, void *data, u32 size,
+              struct nvkm_object **pobject)
+{
+       struct g98_msvld_priv *priv;
+       int ret;
+
+       ret = nvkm_falcon_create(parent, engine, oclass, 0x084000, true,
+                                "PMSVLD", "msvld", &priv);
+       *pobject = nv_object(priv);
+       if (ret)
+               return ret;
+
+       nv_subdev(priv)->unit = 0x04008000;
+       nv_engine(priv)->cclass = &g98_msvld_cclass;
+       nv_engine(priv)->sclass = g98_msvld_sclass;
+       return 0;
+}
+
+struct nvkm_oclass
+g98_msvld_oclass = {
+       .handle = NV_ENGINE(MSVLD, 0x98),
+       .ofuncs = &(struct nvkm_ofuncs) {
+               .ctor = g98_msvld_ctor,
+               .dtor = _nvkm_falcon_dtor,
+               .init = g98_msvld_init,
+               .fini = _nvkm_falcon_fini,
+               .rd32 = _nvkm_falcon_rd32,
+               .wr32 = _nvkm_falcon_wr32,
+       },
+};
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c
new file mode 100644 (file)
index 0000000..b8d1e0f
--- /dev/null
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2012 Maarten Lankhorst
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Maarten Lankhorst
+ */
+#include <engine/msvld.h>
+#include <engine/falcon.h>
+
+struct gf100_msvld_priv {
+       struct nvkm_falcon base;
+};
+
+/*******************************************************************************
+ * MSVLD object classes
+ ******************************************************************************/
+
+static struct nvkm_oclass
+gf100_msvld_sclass[] = {
+       { 0x90b1, &nvkm_object_ofuncs },
+       {},
+};
+
+/*******************************************************************************
+ * PMSVLD context
+ ******************************************************************************/
+
+static struct nvkm_oclass
+gf100_msvld_cclass = {
+       .handle = NV_ENGCTX(MSVLD, 0xc0),
+       .ofuncs = &(struct nvkm_ofuncs) {
+               .ctor = _nvkm_falcon_context_ctor,
+               .dtor = _nvkm_falcon_context_dtor,
+               .init = _nvkm_falcon_context_init,
+               .fini = _nvkm_falcon_context_fini,
+               .rd32 = _nvkm_falcon_context_rd32,
+               .wr32 = _nvkm_falcon_context_wr32,
+       },
+};
+
+/*******************************************************************************
+ * PMSVLD engine/subdev functions
+ ******************************************************************************/
+
+static int
+gf100_msvld_init(struct nvkm_object *object)
+{
+       struct gf100_msvld_priv *priv = (void *)object;
+       int ret;
+
+       ret = nvkm_falcon_init(&priv->base);
+       if (ret)
+               return ret;
+
+       nv_wr32(priv, 0x084010, 0x0000fff2);
+       nv_wr32(priv, 0x08401c, 0x0000fff2);
+       return 0;
+}
+
+static int
+gf100_msvld_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
+                struct nvkm_oclass *oclass, void *data, u32 size,
+                struct nvkm_object **pobject)
+{
+       struct gf100_msvld_priv *priv;
+       int ret;
+
+       ret = nvkm_falcon_create(parent, engine, oclass, 0x084000, true,
+                                "PMSVLD", "msvld", &priv);
+       *pobject = nv_object(priv);
+       if (ret)
+               return ret;
+
+       nv_subdev(priv)->unit = 0x00008000;
+       nv_subdev(priv)->intr = nvkm_falcon_intr;
+       nv_engine(priv)->cclass = &gf100_msvld_cclass;
+       nv_engine(priv)->sclass = gf100_msvld_sclass;
+       return 0;
+}
+
+struct nvkm_oclass
+gf100_msvld_oclass = {
+       .handle = NV_ENGINE(MSVLD, 0xc0),
+       .ofuncs = &(struct nvkm_ofuncs) {
+               .ctor = gf100_msvld_ctor,
+               .dtor = _nvkm_falcon_dtor,
+               .init = gf100_msvld_init,
+               .fini = _nvkm_falcon_fini,
+               .rd32 = _nvkm_falcon_rd32,
+               .wr32 = _nvkm_falcon_wr32,
+       },
+};
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c
new file mode 100644 (file)
index 0000000..a0b0927
--- /dev/null
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2012 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Ben Skeggs
+ */
+#include <engine/msvld.h>
+#include <engine/falcon.h>
+
+struct gk104_msvld_priv {
+       struct nvkm_falcon base;
+};
+
+/*******************************************************************************
+ * MSVLD object classes
+ ******************************************************************************/
+
+static struct nvkm_oclass
+gk104_msvld_sclass[] = {
+       { 0x95b1, &nvkm_object_ofuncs },
+       {},
+};
+
+/*******************************************************************************
+ * PMSVLD context
+ ******************************************************************************/
+
+static struct nvkm_oclass
+gk104_msvld_cclass = {
+       .handle = NV_ENGCTX(MSVLD, 0xe0),
+       .ofuncs = &(struct nvkm_ofuncs) {
+               .ctor = _nvkm_falcon_context_ctor,
+               .dtor = _nvkm_falcon_context_dtor,
+               .init = _nvkm_falcon_context_init,
+               .fini = _nvkm_falcon_context_fini,
+               .rd32 = _nvkm_falcon_context_rd32,
+               .wr32 = _nvkm_falcon_context_wr32,
+       },
+};
+
+/*******************************************************************************
+ * PMSVLD engine/subdev functions
+ ******************************************************************************/
+
+static int
+gk104_msvld_init(struct nvkm_object *object)
+{
+       struct gk104_msvld_priv *priv = (void *)object;
+       int ret;
+
+       ret = nvkm_falcon_init(&priv->base);
+       if (ret)
+               return ret;
+
+       nv_wr32(priv, 0x084010, 0x0000fff2);
+       nv_wr32(priv, 0x08401c, 0x0000fff2);
+       return 0;
+}
+
+static int
+gk104_msvld_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
+                struct nvkm_oclass *oclass, void *data, u32 size,
+                struct nvkm_object **pobject)
+{
+       struct gk104_msvld_priv *priv;
+       int ret;
+
+       ret = nvkm_falcon_create(parent, engine, oclass, 0x084000, true,
+                                "PMSVLD", "msvld", &priv);
+       *pobject = nv_object(priv);
+       if (ret)
+               return ret;
+
+       nv_subdev(priv)->unit = 0x00008000;
+       nv_subdev(priv)->intr = nvkm_falcon_intr;
+       nv_engine(priv)->cclass = &gk104_msvld_cclass;
+       nv_engine(priv)->sclass = gk104_msvld_sclass;
+       return 0;
+}
+
+struct nvkm_oclass
+gk104_msvld_oclass = {
+       .handle = NV_ENGINE(MSVLD, 0xe0),
+       .ofuncs = &(struct nvkm_ofuncs) {
+               .ctor = gk104_msvld_ctor,
+               .dtor = _nvkm_falcon_dtor,
+               .init = gk104_msvld_init,
+               .fini = _nvkm_falcon_fini,
+               .rd32 = _nvkm_falcon_rd32,
+               .wr32 = _nvkm_falcon_wr32,
+       },
+};
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/nv98.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/nv98.c
deleted file mode 100644 (file)
index 4bafba5..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2012 Red Hat Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: Ben Skeggs, Maarten Lankhorst, Ilia Mirkin
- */
-
-#include <engine/falcon.h>
-#include <engine/msvld.h>
-
-struct nv98_msvld_priv {
-       struct nouveau_falcon base;
-};
-
-/*******************************************************************************
- * MSVLD object classes
- ******************************************************************************/
-
-static struct nouveau_oclass
-nv98_msvld_sclass[] = {
-       { 0x88b1, &nouveau_object_ofuncs },
-       { 0x85b1, &nouveau_object_ofuncs },
-       { 0x86b1, &nouveau_object_ofuncs },
-       {},
-};
-
-/*******************************************************************************
- * PMSVLD context
- ******************************************************************************/
-
-static struct nouveau_oclass
-nv98_msvld_cclass = {
-       .handle = NV_ENGCTX(MSVLD, 0x98),
-       .ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = _nouveau_falcon_context_ctor,
-               .dtor = _nouveau_falcon_context_dtor,
-               .init = _nouveau_falcon_context_init,
-               .fini = _nouveau_falcon_context_fini,
-               .rd32 = _nouveau_falcon_context_rd32,
-               .wr32 = _nouveau_falcon_context_wr32,
-       },
-};
-
-/*******************************************************************************
- * PMSVLD engine/subdev functions
- ******************************************************************************/
-
-static int
-nv98_msvld_init(struct nouveau_object *object)
-{
-       struct nv98_msvld_priv *priv = (void *)object;
-       int ret;
-
-       ret = nouveau_falcon_init(&priv->base);
-       if (ret)
-               return ret;
-
-       nv_wr32(priv, 0x084010, 0x0000ffd2);
-       nv_wr32(priv, 0x08401c, 0x0000fff2);
-       return 0;
-}
-
-static int
-nv98_msvld_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
-             struct nouveau_oclass *oclass, void *data, u32 size,
-             struct nouveau_object **pobject)
-{
-       struct nv98_msvld_priv *priv;
-       int ret;
-
-       ret = nouveau_falcon_create(parent, engine, oclass, 0x084000, true,
-                                   "PMSVLD", "msvld", &priv);
-       *pobject = nv_object(priv);
-       if (ret)
-               return ret;
-
-       nv_subdev(priv)->unit = 0x04008000;
-       nv_engine(priv)->cclass = &nv98_msvld_cclass;
-       nv_engine(priv)->sclass = nv98_msvld_sclass;
-       return 0;
-}
-
-struct nouveau_oclass
-nv98_msvld_oclass = {
-       .handle = NV_ENGINE(MSVLD, 0x98),
-       .ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = nv98_msvld_ctor,
-               .dtor = _nouveau_falcon_dtor,
-               .init = nv98_msvld_init,
-               .fini = _nouveau_falcon_fini,
-               .rd32 = _nouveau_falcon_rd32,
-               .wr32 = _nouveau_falcon_wr32,
-       },
-};
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/nvc0.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/nvc0.c
deleted file mode 100644 (file)
index fd2ac0d..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2012 Maarten Lankhorst
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: Maarten Lankhorst
- */
-
-#include <engine/falcon.h>
-#include <engine/msvld.h>
-
-struct nvc0_msvld_priv {
-       struct nouveau_falcon base;
-};
-
-/*******************************************************************************
- * MSVLD object classes
- ******************************************************************************/
-
-static struct nouveau_oclass
-nvc0_msvld_sclass[] = {
-       { 0x90b1, &nouveau_object_ofuncs },
-       {},
-};
-
-/*******************************************************************************
- * PMSVLD context
- ******************************************************************************/
-
-static struct nouveau_oclass
-nvc0_msvld_cclass = {
-       .handle = NV_ENGCTX(MSVLD, 0xc0),
-       .ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = _nouveau_falcon_context_ctor,
-               .dtor = _nouveau_falcon_context_dtor,
-               .init = _nouveau_falcon_context_init,
-               .fini = _nouveau_falcon_context_fini,
-               .rd32 = _nouveau_falcon_context_rd32,
-               .wr32 = _nouveau_falcon_context_wr32,
-       },
-};
-
-/*******************************************************************************
- * PMSVLD engine/subdev functions
- ******************************************************************************/
-
-static int
-nvc0_msvld_init(struct nouveau_object *object)
-{
-       struct nvc0_msvld_priv *priv = (void *)object;
-       int ret;
-
-       ret = nouveau_falcon_init(&priv->base);
-       if (ret)
-               return ret;
-
-       nv_wr32(priv, 0x084010, 0x0000fff2);
-       nv_wr32(priv, 0x08401c, 0x0000fff2);
-       return 0;
-}
-
-static int
-nvc0_msvld_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
-             struct nouveau_oclass *oclass, void *data, u32 size,
-             struct nouveau_object **pobject)
-{
-       struct nvc0_msvld_priv *priv;
-       int ret;
-
-       ret = nouveau_falcon_create(parent, engine, oclass, 0x084000, true,
-                                   "PMSVLD", "msvld", &priv);
-       *pobject = nv_object(priv);
-       if (ret)
-               return ret;
-
-       nv_subdev(priv)->unit = 0x00008000;
-       nv_subdev(priv)->intr = nouveau_falcon_intr;
-       nv_engine(priv)->cclass = &nvc0_msvld_cclass;
-       nv_engine(priv)->sclass = nvc0_msvld_sclass;
-       return 0;
-}
-
-struct nouveau_oclass
-nvc0_msvld_oclass = {
-       .handle = NV_ENGINE(MSVLD, 0xc0),
-       .ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = nvc0_msvld_ctor,
-               .dtor = _nouveau_falcon_dtor,
-               .init = nvc0_msvld_init,
-               .fini = _nouveau_falcon_fini,
-               .rd32 = _nouveau_falcon_rd32,
-               .wr32 = _nouveau_falcon_wr32,
-       },
-};
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/nve0.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/nve0.c
deleted file mode 100644 (file)
index 4b3d3ca..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2012 Red Hat Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: Ben Skeggs
- */
-
-#include <engine/falcon.h>
-#include <engine/msvld.h>
-
-struct nve0_msvld_priv {
-       struct nouveau_falcon base;
-};
-
-/*******************************************************************************
- * MSVLD object classes
- ******************************************************************************/
-
-static struct nouveau_oclass
-nve0_msvld_sclass[] = {
-       { 0x95b1, &nouveau_object_ofuncs },
-       {},
-};
-
-/*******************************************************************************
- * PMSVLD context
- ******************************************************************************/
-
-static struct nouveau_oclass
-nve0_msvld_cclass = {
-       .handle = NV_ENGCTX(MSVLD, 0xe0),
-       .ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = _nouveau_falcon_context_ctor,
-               .dtor = _nouveau_falcon_context_dtor,
-               .init = _nouveau_falcon_context_init,
-               .fini = _nouveau_falcon_context_fini,
-               .rd32 = _nouveau_falcon_context_rd32,
-               .wr32 = _nouveau_falcon_context_wr32,
-       },
-};
-
-/*******************************************************************************
- * PMSVLD engine/subdev functions
- ******************************************************************************/
-
-static int
-nve0_msvld_init(struct nouveau_object *object)
-{
-       struct nve0_msvld_priv *priv = (void *)object;
-       int ret;
-
-       ret = nouveau_falcon_init(&priv->base);
-       if (ret)
-               return ret;
-
-       nv_wr32(priv, 0x084010, 0x0000fff2);
-       nv_wr32(priv, 0x08401c, 0x0000fff2);
-       return 0;
-}
-
-static int
-nve0_msvld_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
-             struct nouveau_oclass *oclass, void *data, u32 size,
-             struct nouveau_object **pobject)
-{
-       struct nve0_msvld_priv *priv;
-       int ret;
-
-       ret = nouveau_falcon_create(parent, engine, oclass, 0x084000, true,
-                                   "PMSVLD", "msvld", &priv);
-       *pobject = nv_object(priv);
-       if (ret)
-               return ret;
-
-       nv_subdev(priv)->unit = 0x00008000;
-       nv_subdev(priv)->intr = nouveau_falcon_intr;
-       nv_engine(priv)->cclass = &nve0_msvld_cclass;
-       nv_engine(priv)->sclass = nve0_msvld_sclass;
-       return 0;
-}
-
-struct nouveau_oclass
-nve0_msvld_oclass = {
-       .handle = NV_ENGINE(MSVLD, 0xe0),
-       .ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = nve0_msvld_ctor,
-               .dtor = _nouveau_falcon_dtor,
-               .init = nve0_msvld_init,
-               .fini = _nouveau_falcon_fini,
-               .rd32 = _nouveau_falcon_rd32,
-               .wr32 = _nouveau_falcon_wr32,
-       },
-};