drm/nouveau/disp: convert to new-style nvkm_engine

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

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c
index c16d9586708b26cdb30505af3a64e40dfae7da31..c0c1bd3989d603122f0596883e8aa50fa82d55f5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c
@@ -31,20 +31,12 @@ gm100_identify(struct nvkm_device *device)
 
 #if 0
 #endif
-               device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  gk208_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  gf100_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  gm107_gr_oclass;
-               device->oclass[NVDEV_ENGINE_DISP   ] =  gm107_disp_oclass;
-               device->oclass[NVDEV_ENGINE_CE0    ] = &gk104_ce0_oclass;
 #if 0
-               device->oclass[NVDEV_ENGINE_CE1    ] = &gk104_ce1_oclass;
 #endif
-               device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;
 #if 0
-               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
                break;
        case 0x124:
@@ -54,18 +46,10 @@ gm100_identify(struct nvkm_device *device)
 #endif
 #if 0
 #endif
-               device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  gm204_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  gf100_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  gm204_gr_oclass;
-               device->oclass[NVDEV_ENGINE_DISP   ] =  gm204_disp_oclass;
-               device->oclass[NVDEV_ENGINE_CE0    ] = &gm204_ce0_oclass;
-               device->oclass[NVDEV_ENGINE_CE1    ] = &gm204_ce1_oclass;
-               device->oclass[NVDEV_ENGINE_CE2    ] = &gm204_ce2_oclass;
 #if 0
-               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
                break;
        case 0x126:
@@ -75,27 +59,17 @@ gm100_identify(struct nvkm_device *device)
 #endif
 #if 0
 #endif
-               device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  gm204_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  gf100_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  gm206_gr_oclass;
-               device->oclass[NVDEV_ENGINE_DISP   ] =  gm204_disp_oclass;
-               device->oclass[NVDEV_ENGINE_CE0    ] = &gm204_ce0_oclass;
-               device->oclass[NVDEV_ENGINE_CE1    ] = &gm204_ce1_oclass;
-               device->oclass[NVDEV_ENGINE_CE2    ] = &gm204_ce2_oclass;
 #if 0
-               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
                break;
        case 0x12b:
 
-               device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
                device->oclass[NVDEV_ENGINE_FIFO   ] =  gm20b_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  gf100_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  gm20b_gr_oclass;
-               device->oclass[NVDEV_ENGINE_CE2    ] = &gm204_ce2_oclass;
                break;
        default:
                return -EINVAL;