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

[deliverable/linux.git] / drivers / gpu / drm / nouveau / nvkm / engine / device / nv50.c

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c
index bcbf2d8f692a4bbef2c9109d36fbf23f5e8ea563..35cc167e7b0692dc80d8f9957d8408dce0ad4682 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c
@@ -42,9 +42,7 @@ nv50_identify(struct nvkm_device *device)
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &g84_mpeg_oclass;
-               device->oclass[NVDEV_ENGINE_VP     ] = &g84_vp_oclass;
                device->oclass[NVDEV_ENGINE_CIPHER ] = &g84_cipher_oclass;
-               device->oclass[NVDEV_ENGINE_BSP    ] = &g84_bsp_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  g84_disp_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] =  g84_pm_oclass;
                break;
@@ -54,9 +52,7 @@ nv50_identify(struct nvkm_device *device)
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &g84_mpeg_oclass;
-               device->oclass[NVDEV_ENGINE_VP     ] = &g84_vp_oclass;
                device->oclass[NVDEV_ENGINE_CIPHER ] = &g84_cipher_oclass;
-               device->oclass[NVDEV_ENGINE_BSP    ] = &g84_bsp_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  g84_disp_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] =  g84_pm_oclass;
                break;
@@ -66,9 +62,7 @@ nv50_identify(struct nvkm_device *device)
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &g84_mpeg_oclass;
-               device->oclass[NVDEV_ENGINE_VP     ] = &g84_vp_oclass;
                device->oclass[NVDEV_ENGINE_CIPHER ] = &g84_cipher_oclass;
-               device->oclass[NVDEV_ENGINE_BSP    ] = &g84_bsp_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  g84_disp_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] =  g84_pm_oclass;
                break;
@@ -78,9 +72,7 @@ nv50_identify(struct nvkm_device *device)
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &g84_mpeg_oclass;
-               device->oclass[NVDEV_ENGINE_VP     ] = &g84_vp_oclass;
                device->oclass[NVDEV_ENGINE_CIPHER ] = &g84_cipher_oclass;
-               device->oclass[NVDEV_ENGINE_BSP    ] = &g84_bsp_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  g94_disp_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] =  g84_pm_oclass;
                break;
@@ -90,9 +82,7 @@ nv50_identify(struct nvkm_device *device)
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &g84_mpeg_oclass;
-               device->oclass[NVDEV_ENGINE_VP     ] = &g84_vp_oclass;
                device->oclass[NVDEV_ENGINE_CIPHER ] = &g84_cipher_oclass;
-               device->oclass[NVDEV_ENGINE_BSP    ] = &g84_bsp_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  g94_disp_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] =  g84_pm_oclass;
                break;
@@ -110,9 +100,7 @@ nv50_identify(struct nvkm_device *device)
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &g84_mpeg_oclass;
-               device->oclass[NVDEV_ENGINE_VP     ] = &g84_vp_oclass;
                device->oclass[NVDEV_ENGINE_CIPHER ] = &g84_cipher_oclass;
-               device->oclass[NVDEV_ENGINE_BSP    ] = &g84_bsp_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  gt200_disp_oclass;
                device->oclass[NVDEV_ENGINE_PM     ] =  gt200_pm_oclass;
                break;