]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/nouveau/core: sort engine indices alphabetically
authorBen Skeggs <bskeggs@redhat.com>
Fri, 11 Mar 2016 03:09:28 +0000 (13:09 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 14 Mar 2016 00:13:43 +0000 (10:13 +1000)
Unlike subdevs, these aren't initialised in a defined order.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/include/nvkm/core/device.h

index 8c92c7c489cb24772027fd8000ee3575eaccdb73..0e2a5be2bf5c4ca5b746b2bacee56da222234e79 100644 (file)
@@ -27,27 +27,30 @@ enum nvkm_devidx {
        NVKM_SUBDEV_CLK,
        NVKM_SUBDEV_SECBOOT,
 
-       NVKM_ENGINE_DMAOBJ,
-       NVKM_ENGINE_IFB,
-       NVKM_ENGINE_FIFO,
-       NVKM_ENGINE_SW,
-       NVKM_ENGINE_GR,
-       NVKM_ENGINE_MPEG,
-       NVKM_ENGINE_ME,
-       NVKM_ENGINE_VP,
-       NVKM_ENGINE_CIPHER,
        NVKM_ENGINE_BSP,
-       NVKM_ENGINE_MSPPP,
+
        NVKM_ENGINE_CE0,
        NVKM_ENGINE_CE1,
        NVKM_ENGINE_CE2,
-       NVKM_ENGINE_VIC,
-       NVKM_ENGINE_MSENC,
+       NVKM_ENGINE_CE_LAST = NVKM_ENGINE_CE2,
+
+       NVKM_ENGINE_CIPHER,
        NVKM_ENGINE_DISP,
-       NVKM_ENGINE_PM,
+       NVKM_ENGINE_DMAOBJ,
+       NVKM_ENGINE_FIFO,
+       NVKM_ENGINE_GR,
+       NVKM_ENGINE_IFB,
+       NVKM_ENGINE_ME,
+       NVKM_ENGINE_MPEG,
+       NVKM_ENGINE_MSENC,
+       NVKM_ENGINE_MSPDEC,
+       NVKM_ENGINE_MSPPP,
        NVKM_ENGINE_MSVLD,
+       NVKM_ENGINE_PM,
        NVKM_ENGINE_SEC,
-       NVKM_ENGINE_MSPDEC,
+       NVKM_ENGINE_SW,
+       NVKM_ENGINE_VIC,
+       NVKM_ENGINE_VP,
 
        NVKM_SUBDEV_NR
 };