drm/nouveau/mspdec: namespace + nvidia gpu names (no binary change)

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / nouveau / nvkm / engine / device / nve0.c

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/nve0.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/nve0.c
index 6c3842ce034bd2e617b3288ec6c0fbbce74369f5..56c3e67b8962faa36f92810f719fe791f6cdeec8 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/nve0.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/nve0.c
@@ -89,7 +89,7 @@ nve0_identify(struct nouveau_device *device)
                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_MSPDEC ] = &nve0_mspdec_oclass;
+               device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;
                break;
@@ -123,7 +123,7 @@ nve0_identify(struct nouveau_device *device)
                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_MSPDEC ] = &nve0_mspdec_oclass;
+               device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;
                break;
@@ -157,7 +157,7 @@ nve0_identify(struct nouveau_device *device)
                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_MSPDEC ] = &nve0_mspdec_oclass;
+               device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;
                break;
@@ -213,7 +213,7 @@ nve0_identify(struct nouveau_device *device)
                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_MSPDEC ] = &nve0_mspdec_oclass;
+               device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] = &nvf0_pm_oclass;
                break;
@@ -247,7 +247,7 @@ nve0_identify(struct nouveau_device *device)
                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_MSPDEC ] = &nve0_mspdec_oclass;
+               device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] = &nvf0_pm_oclass;
                break;
@@ -281,7 +281,7 @@ nve0_identify(struct nouveau_device *device)
                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_MSPDEC ] = &nve0_mspdec_oclass;
+               device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;
                break;
        case 0x108:
@@ -314,7 +314,7 @@ nve0_identify(struct nouveau_device *device)
                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_MSPDEC ] = &nve0_mspdec_oclass;
+               device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;
                device->oclass[NVDEV_ENGINE_MSPPP  ] = &nvc0_msppp_oclass;
                break;
        default: