drm/nouveau/sw: rename from software (no binary change)

Shorter device name, make consistent with our engine enums.

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>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv10.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv10.c
index f292e7b88628..66d8c338ae98 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv10.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv10.c
@@ -37,7 +37,7 @@
 #include <engine/device.h>
 #include <engine/dmaobj.h>
 #include <engine/fifo.h>
-#include <engine/software.h>
+#include <engine/sw.h>
 #include <engine/gr.h>
 #include <engine/disp.h>
 
@@ -77,7 +77,7 @@ nv10_identify(struct nouveau_device *device)
                 device->oclass[NVDEV_SUBDEV_MMU    ] = &nv04_mmu_oclass;
                 device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv04_dmaeng_oclass;
                 device->oclass[NVDEV_ENGINE_FIFO   ] =  nv10_fifo_oclass;
-                device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
+                device->oclass[NVDEV_ENGINE_SW     ] =  nv10_sw_oclass;
                 device->oclass[NVDEV_ENGINE_GR     ] = &nv10_gr_oclass;
                 device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
                 break;
@@ -96,7 +96,7 @@ nv10_identify(struct nouveau_device *device)
                 device->oclass[NVDEV_SUBDEV_MMU    ] = &nv04_mmu_oclass;
                 device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv04_dmaeng_oclass;
                 device->oclass[NVDEV_ENGINE_FIFO   ] =  nv10_fifo_oclass;
-                device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
+                device->oclass[NVDEV_ENGINE_SW     ] =  nv10_sw_oclass;
                 device->oclass[NVDEV_ENGINE_GR     ] = &nv10_gr_oclass;
                 device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
                 break;
@@ -115,7 +115,7 @@ nv10_identify(struct nouveau_device *device)
                 device->oclass[NVDEV_SUBDEV_MMU    ] = &nv04_mmu_oclass;
                 device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv04_dmaeng_oclass;
                 device->oclass[NVDEV_ENGINE_FIFO   ] =  nv10_fifo_oclass;
-                device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
+                device->oclass[NVDEV_ENGINE_SW     ] =  nv10_sw_oclass;
                 device->oclass[NVDEV_ENGINE_GR     ] = &nv10_gr_oclass;
                 device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
                 break;
@@ -134,7 +134,7 @@ nv10_identify(struct nouveau_device *device)
                 device->oclass[NVDEV_SUBDEV_MMU    ] = &nv04_mmu_oclass;
                 device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv04_dmaeng_oclass;
                 device->oclass[NVDEV_ENGINE_FIFO   ] =  nv10_fifo_oclass;
-                device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
+                device->oclass[NVDEV_ENGINE_SW     ] =  nv10_sw_oclass;
                 device->oclass[NVDEV_ENGINE_GR     ] = &nv10_gr_oclass;
                 device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
                 break;
@@ -153,7 +153,7 @@ nv10_identify(struct nouveau_device *device)
                 device->oclass[NVDEV_SUBDEV_MMU    ] = &nv04_mmu_oclass;
                 device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv04_dmaeng_oclass;
                 device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;
-                device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
+                device->oclass[NVDEV_ENGINE_SW     ] =  nv10_sw_oclass;
                 device->oclass[NVDEV_ENGINE_GR     ] = &nv10_gr_oclass;
                 device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
                 break;
@@ -172,7 +172,7 @@ nv10_identify(struct nouveau_device *device)
                 device->oclass[NVDEV_SUBDEV_MMU    ] = &nv04_mmu_oclass;
                 device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv04_dmaeng_oclass;
                 device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;
-                device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
+                device->oclass[NVDEV_ENGINE_SW     ] =  nv10_sw_oclass;
                 device->oclass[NVDEV_ENGINE_GR     ] = &nv10_gr_oclass;
                 device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
                 break;
@@ -191,7 +191,7 @@ nv10_identify(struct nouveau_device *device)
                 device->oclass[NVDEV_SUBDEV_MMU    ] = &nv04_mmu_oclass;
                 device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv04_dmaeng_oclass;
                 device->oclass[NVDEV_ENGINE_FIFO   ] =  nv17_fifo_oclass;
-                device->oclass[NVDEV_ENGINE_SW     ] =  nv10_software_oclass;
+                device->oclass[NVDEV_ENGINE_SW     ] =  nv10_sw_oclass;
                 device->oclass[NVDEV_ENGINE_GR     ] = &nv10_gr_oclass;
                 device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
                 break;