drm/nouveau/pm: rename from perfmon (no binary change)

Switch to NVIDIA's name for the device.

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>

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
index 952e36c..3d87d3d 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
@@ -58,7 +58,7 @@ enum nv_subdev_type {
        NVDEV_ENGINE_VIC,
        NVDEV_ENGINE_VENC,
        NVDEV_ENGINE_DISP,
-       NVDEV_ENGINE_PERFMON,
+       NVDEV_ENGINE_PM,
        NVDEV_ENGINE_MSVLD,
        NVDEV_ENGINE_SEC,
 

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/perfmon.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/perfmon.h
deleted file mode 100644 (file)
index 251c854..0000000
--- a/drivers/gpu/drm/nouveau/include/nvkm/engine/perfmon.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef __NVKM_PERFMON_H__
-#define __NVKM_PERFMON_H__
-
-#include <core/device.h>
-#include <core/engine.h>
-#include <core/engctx.h>
-
-struct nouveau_perfdom;
-struct nouveau_perfctr;
-struct nouveau_perfmon {
-       struct nouveau_engine base;
-
-       struct nouveau_perfctx *context;
-       void *profile_data;
-
-       struct list_head domains;
-       u32 sequence;
-
-       /*XXX: temp for daemon backend */
-       u32 pwr[8];
-       u32 last;
-};
-
-static inline struct nouveau_perfmon *
-nouveau_perfmon(void *obj)
-{
-       return (void *)nouveau_engine(obj, NVDEV_ENGINE_PERFMON);
-}
-
-extern struct nouveau_oclass *nv40_perfmon_oclass;
-extern struct nouveau_oclass *nv50_perfmon_oclass;
-extern struct nouveau_oclass *nv84_perfmon_oclass;
-extern struct nouveau_oclass *nva3_perfmon_oclass;
-extern struct nouveau_oclass nvc0_perfmon_oclass;
-extern struct nouveau_oclass nve0_perfmon_oclass;
-extern struct nouveau_oclass nvf0_perfmon_oclass;
-
-#endif

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h
new file mode 100644 (file)
index 0000000..c9ffe2c
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h
@@ -0,0 +1,38 @@
+#ifndef __NVKM_PM_H__
+#define __NVKM_PM_H__
+
+#include <core/device.h>
+#include <core/engine.h>
+#include <core/engctx.h>
+
+struct nouveau_perfdom;
+struct nouveau_perfctr;
+struct nouveau_pm {
+       struct nouveau_engine base;
+
+       struct nouveau_perfctx *context;
+       void *profile_data;
+
+       struct list_head domains;
+       u32 sequence;
+
+       /*XXX: temp for daemon backend */
+       u32 pwr[8];
+       u32 last;
+};
+
+static inline struct nouveau_pm *
+nouveau_pm(void *obj)
+{
+       return (void *)nouveau_engine(obj, NVDEV_ENGINE_PM);
+}
+
+extern struct nouveau_oclass *nv40_pm_oclass;
+extern struct nouveau_oclass *nv50_pm_oclass;
+extern struct nouveau_oclass *nv84_pm_oclass;
+extern struct nouveau_oclass *nva3_pm_oclass;
+extern struct nouveau_oclass nvc0_pm_oclass;
+extern struct nouveau_oclass nve0_pm_oclass;
+extern struct nouveau_oclass nvf0_pm_oclass;
+
+#endif

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/Kbuild b/drivers/gpu/drm/nouveau/nvkm/engine/Kbuild
index 183475e..16c3a91 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/Kbuild
@@ -11,7 +11,7 @@ include $(src)/nvkm/engine/fifo/Kbuild
 include $(src)/nvkm/engine/gr/Kbuild
 include $(src)/nvkm/engine/mpeg/Kbuild
 include $(src)/nvkm/engine/msvld/Kbuild
-include $(src)/nvkm/engine/perfmon/Kbuild
+include $(src)/nvkm/engine/pm/Kbuild
 include $(src)/nvkm/engine/ppp/Kbuild
 include $(src)/nvkm/engine/sec/Kbuild
 include $(src)/nvkm/engine/software/Kbuild

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index baad4ad..5b226cb 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -225,7 +225,7 @@ static const u64 disable_map[] = {
        [NVDEV_SUBDEV_PMU]      = NV_DEVICE_V0_DISABLE_CORE,
        [NVDEV_SUBDEV_FUSE]     = NV_DEVICE_V0_DISABLE_CORE,
        [NVDEV_ENGINE_DMAOBJ]   = NV_DEVICE_V0_DISABLE_CORE,
-       [NVDEV_ENGINE_PERFMON]  = NV_DEVICE_V0_DISABLE_CORE,
+       [NVDEV_ENGINE_PM     ]  = NV_DEVICE_V0_DISABLE_CORE,
        [NVDEV_ENGINE_FIFO]     = NV_DEVICE_V0_DISABLE_FIFO,
        [NVDEV_ENGINE_SW]       = NV_DEVICE_V0_DISABLE_FIFO,
        [NVDEV_ENGINE_GR]       = NV_DEVICE_V0_DISABLE_GR,
@@ -319,7 +319,7 @@ nouveau_devobj_ctor(struct nouveau_object *parent,
                                    (1ULL << NVDEV_ENGINE_DMAOBJ) |
                                    (1ULL << NVDEV_ENGINE_FIFO) |
                                    (1ULL << NVDEV_ENGINE_DISP) |
-                                   (1ULL << NVDEV_ENGINE_PERFMON), &devobj);
+                                   (1ULL << NVDEV_ENGINE_PM     ), &devobj);
        *pobject = nv_object(devobj);
        if (ret)
                return ret;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c
index e7289fd..2ea1dbc 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c
@@ -53,7 +53,7 @@
 #include <engine/msvld.h>
 #include <engine/vp.h>
 #include <engine/ppp.h>
-#include <engine/perfmon.h>
+#include <engine/pm.h>
 
 int
 gm100_identify(struct nouveau_device *device)

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c
index 3b16fdc..cd859b0 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c
@@ -44,7 +44,7 @@
 #include <engine/gr.h>
 #include <engine/mpeg.h>
 #include <engine/disp.h>
-#include <engine/perfmon.h>
+#include <engine/pm.h>
 
 int
 nv40_identify(struct nouveau_device *device)
@@ -71,7 +71,7 @@ nv40_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv40_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv40_mpeg_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv40_pm_oclass;
                break;
        case 0x41:
                device->cname = "NV41";
@@ -94,7 +94,7 @@ nv40_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv40_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv40_mpeg_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv40_pm_oclass;
                break;
        case 0x42:
                device->cname = "NV42";
@@ -117,7 +117,7 @@ nv40_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv40_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv40_mpeg_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv40_pm_oclass;
                break;
        case 0x43:
                device->cname = "NV43";
@@ -140,7 +140,7 @@ nv40_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv40_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv40_mpeg_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv40_pm_oclass;
                break;
        case 0x45:
                device->cname = "NV45";
@@ -163,7 +163,7 @@ nv40_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv40_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv40_pm_oclass;
                break;
        case 0x47:
                device->cname = "G70";
@@ -186,7 +186,7 @@ nv40_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv40_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv40_pm_oclass;
                break;
        case 0x49:
                device->cname = "G71";
@@ -209,7 +209,7 @@ nv40_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv40_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv40_pm_oclass;
                break;
        case 0x4b:
                device->cname = "G73";
@@ -232,7 +232,7 @@ nv40_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv40_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv40_pm_oclass;
                break;
        case 0x44:
                device->cname = "NV44";
@@ -255,7 +255,7 @@ nv40_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv40_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv40_pm_oclass;
                break;
        case 0x46:
                device->cname = "G72";
@@ -278,7 +278,7 @@ nv40_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv40_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv40_pm_oclass;
                break;
        case 0x4a:
                device->cname = "NV44A";
@@ -301,7 +301,7 @@ nv40_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv40_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv40_pm_oclass;
                break;
        case 0x4c:
                device->cname = "C61";
@@ -324,7 +324,7 @@ nv40_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv40_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv40_pm_oclass;
                break;
        case 0x4e:
                device->cname = "C51";
@@ -347,7 +347,7 @@ nv40_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv40_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv40_pm_oclass;
                break;
        case 0x63:
                device->cname = "C73";
@@ -370,7 +370,7 @@ nv40_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv40_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv40_pm_oclass;
                break;
        case 0x67:
                device->cname = "C67";
@@ -393,7 +393,7 @@ nv40_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv40_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv40_pm_oclass;
                break;
        case 0x68:
                device->cname = "C68";
@@ -416,7 +416,7 @@ nv40_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv40_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv44_mpeg_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv04_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv40_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv40_pm_oclass;
                break;
        default:
                nv_fatal(device, "unknown Curie chipset\n");

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c
index a9788b4..6e5ccb3 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c
@@ -54,7 +54,7 @@
 #include <engine/ppp.h>
 #include <engine/ce.h>
 #include <engine/disp.h>
-#include <engine/perfmon.h>
+#include <engine/pm.h>
 
 int
 nv50_identify(struct nouveau_device *device)
@@ -84,7 +84,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv50_mpeg_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv50_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv50_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv50_pm_oclass;
                break;
        case 0x84:
                device->cname = "G84";
@@ -113,7 +113,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_CIPHER ] = &nv84_cipher_oclass;
                device->oclass[NVDEV_ENGINE_BSP    ] = &nv84_bsp_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv84_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv84_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;
                break;
        case 0x86:
                device->cname = "G86";
@@ -142,7 +142,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_CIPHER ] = &nv84_cipher_oclass;
                device->oclass[NVDEV_ENGINE_BSP    ] = &nv84_bsp_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv84_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv84_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;
                break;
        case 0x92:
                device->cname = "G92";
@@ -171,7 +171,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_CIPHER ] = &nv84_cipher_oclass;
                device->oclass[NVDEV_ENGINE_BSP    ] = &nv84_bsp_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv84_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv84_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;
                break;
        case 0x94:
                device->cname = "G94";
@@ -200,7 +200,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_CIPHER ] = &nv84_cipher_oclass;
                device->oclass[NVDEV_ENGINE_BSP    ] = &nv84_bsp_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv94_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv84_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;
                break;
        case 0x96:
                device->cname = "G96";
@@ -229,7 +229,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_CIPHER ] = &nv84_cipher_oclass;
                device->oclass[NVDEV_ENGINE_BSP    ] = &nv84_bsp_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv94_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv84_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;
                break;
        case 0x98:
                device->cname = "G98";
@@ -258,7 +258,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;
                device->oclass[NVDEV_ENGINE_PPP    ] = &nv98_ppp_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv94_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv84_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;
                break;
        case 0xa0:
                device->cname = "G200";
@@ -287,7 +287,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_CIPHER ] = &nv84_cipher_oclass;
                device->oclass[NVDEV_ENGINE_BSP    ] = &nv84_bsp_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nva0_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv84_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;
                break;
        case 0xaa:
                device->cname = "MCP77/MCP78";
@@ -316,7 +316,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;
                device->oclass[NVDEV_ENGINE_PPP    ] = &nv98_ppp_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv94_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv84_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;
                break;
        case 0xac:
                device->cname = "MCP79/MCP7A";
@@ -345,7 +345,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_MSVLD  ] = &nv98_msvld_oclass;
                device->oclass[NVDEV_ENGINE_PPP    ] = &nv98_ppp_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nv94_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nv84_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nv84_pm_oclass;
                break;
        case 0xa3:
                device->cname = "GT215";
@@ -376,7 +376,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_PPP    ] = &nv98_ppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &nva3_ce_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nva3_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nva3_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nva3_pm_oclass;
                break;
        case 0xa5:
                device->cname = "GT216";
@@ -406,7 +406,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_PPP    ] = &nv98_ppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &nva3_ce_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nva3_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nva3_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nva3_pm_oclass;
                break;
        case 0xa8:
                device->cname = "GT218";
@@ -436,7 +436,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_PPP    ] = &nv98_ppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &nva3_ce_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nva3_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nva3_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nva3_pm_oclass;
                break;
        case 0xaf:
                device->cname = "MCP89";
@@ -466,7 +466,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_PPP    ] = &nv98_ppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &nva3_ce_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nva3_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] =  nva3_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] =  nva3_pm_oclass;
                break;
        default:
                nv_fatal(device, "unknown Tesla chipset\n");

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/nvc0.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/nvc0.c
index 1f93c96..d159d29 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/nvc0.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/nvc0.c
@@ -53,7 +53,7 @@
 #include <engine/ppp.h>
 #include <engine/ce.h>
 #include <engine/disp.h>
-#include <engine/perfmon.h>
+#include <engine/pm.h>
 
 int
 nvc0_identify(struct nouveau_device *device)
@@ -90,7 +90,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_CE0    ] = &nvc0_ce0_oclass;
                device->oclass[NVDEV_ENGINE_CE1    ] = &nvc0_ce1_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nva3_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] = &nvc0_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] = &nvc0_pm_oclass;
                break;
        case 0xc4:
                device->cname = "GF104";
@@ -123,7 +123,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_CE0    ] = &nvc0_ce0_oclass;
                device->oclass[NVDEV_ENGINE_CE1    ] = &nvc0_ce1_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nva3_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] = &nvc0_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] = &nvc0_pm_oclass;
                break;
        case 0xc3:
                device->cname = "GF106";
@@ -155,7 +155,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &nvc0_ce0_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nva3_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] = &nvc0_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] = &nvc0_pm_oclass;
                break;
        case 0xce:
                device->cname = "GF114";
@@ -188,7 +188,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_CE0    ] = &nvc0_ce0_oclass;
                device->oclass[NVDEV_ENGINE_CE1    ] = &nvc0_ce1_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nva3_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] = &nvc0_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] = &nvc0_pm_oclass;
                break;
        case 0xcf:
                device->cname = "GF116";
@@ -220,7 +220,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &nvc0_ce0_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nva3_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] = &nvc0_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] = &nvc0_pm_oclass;
                break;
        case 0xc1:
                device->cname = "GF108";
@@ -252,7 +252,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &nvc0_ce0_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nva3_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] = &nvc0_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] = &nvc0_pm_oclass;
                break;
        case 0xc8:
                device->cname = "GF110";
@@ -285,7 +285,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_CE0    ] = &nvc0_ce0_oclass;
                device->oclass[NVDEV_ENGINE_CE1    ] = &nvc0_ce1_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nva3_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] = &nvc0_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] = &nvc0_pm_oclass;
                break;
        case 0xd9:
                device->cname = "GF119";
@@ -317,7 +317,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &nvc0_ce0_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nvd0_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] = &nvc0_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] = &nvc0_pm_oclass;
                break;
        case 0xd7:
                device->cname = "GF117";
@@ -347,7 +347,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;
                device->oclass[NVDEV_ENGINE_CE0    ] = &nvc0_ce0_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  nvd0_disp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] = &nvc0_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] = &nvc0_pm_oclass;
                break;
        default:
                nv_fatal(device, "unknown Fermi chipset\n");

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/nve0.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/nve0.c
index c18f582..c68e76b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/nve0.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/nve0.c
@@ -53,7 +53,7 @@
 #include <engine/msvld.h>
 #include <engine/vp.h>
 #include <engine/ppp.h>
-#include <engine/perfmon.h>
+#include <engine/pm.h>
 
 int
 nve0_identify(struct nouveau_device *device)
@@ -91,7 +91,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;
                device->oclass[NVDEV_ENGINE_VP     ] = &nve0_vp_oclass;
                device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] = &nve0_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;
                break;
        case 0xe7:
                device->cname = "GK107";
@@ -125,7 +125,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;
                device->oclass[NVDEV_ENGINE_VP     ] = &nve0_vp_oclass;
                device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] = &nve0_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;
                break;
        case 0xe6:
                device->cname = "GK106";
@@ -159,7 +159,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;
                device->oclass[NVDEV_ENGINE_VP     ] = &nve0_vp_oclass;
                device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] = &nve0_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;
                break;
        case 0xea:
                device->cname = "GK20A";
@@ -179,7 +179,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  gk20a_gr_oclass;
                device->oclass[NVDEV_ENGINE_CE2    ] = &nve0_ce2_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] = &nve0_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] = &nve0_pm_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &gk20a_volt_oclass;
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gk20a_pmu_oclass;
                break;
@@ -215,7 +215,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;
                device->oclass[NVDEV_ENGINE_VP     ] = &nve0_vp_oclass;
                device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] = &nvf0_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] = &nvf0_pm_oclass;
                break;
        case 0xf1:
                device->cname = "GK110B";
@@ -249,7 +249,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_ENGINE_MSVLD  ] = &nve0_msvld_oclass;
                device->oclass[NVDEV_ENGINE_VP     ] = &nve0_vp_oclass;
                device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;
-               device->oclass[NVDEV_ENGINE_PERFMON] = &nvf0_perfmon_oclass;
+               device->oclass[NVDEV_ENGINE_PM     ] = &nvf0_pm_oclass;
                break;
        case 0x106:
                device->cname = "GK208B";

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/Kbuild b/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/Kbuild
deleted file mode 100644 (file)
index d5f574c..0000000
--- a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/Kbuild
+++ /dev/null
@@ -1,9 +0,0 @@
-nvkm-y += nvkm/engine/perfmon/base.o
-nvkm-y += nvkm/engine/perfmon/daemon.o
-nvkm-y += nvkm/engine/perfmon/nv40.o
-nvkm-y += nvkm/engine/perfmon/nv50.o
-nvkm-y += nvkm/engine/perfmon/nv84.o
-nvkm-y += nvkm/engine/perfmon/nva3.o
-nvkm-y += nvkm/engine/perfmon/nvc0.o
-nvkm-y += nvkm/engine/perfmon/nve0.o
-nvkm-y += nvkm/engine/perfmon/nvf0.o

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/priv.h
deleted file mode 100644 (file)
index 0ac8714..0000000
--- a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/priv.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#ifndef __NVKM_PERFMON_PRIV_H__
-#define __NVKM_PERFMON_PRIV_H__
-
-#include <engine/perfmon.h>
-
-struct nouveau_perfctr {
-       struct nouveau_object base;
-       struct list_head head;
-       struct nouveau_perfsig *signal[4];
-       int slot;
-       u32 logic_op;
-       u32 clk;
-       u32 ctr;
-};
-
-extern struct nouveau_oclass nouveau_perfmon_sclass[];
-
-struct nouveau_perfctx {
-       struct nouveau_engctx base;
-};
-
-extern struct nouveau_oclass nouveau_perfmon_cclass;
-
-struct nouveau_specsig {
-       u8 signal;
-       const char *name;
-};
-
-struct nouveau_perfsig {
-       const char *name;
-};
-
-struct nouveau_perfdom;
-struct nouveau_perfctr *
-nouveau_perfsig_wrap(struct nouveau_perfmon *, const char *,
-                    struct nouveau_perfdom **);
-
-struct nouveau_specdom {
-       u16 signal_nr;
-       const struct nouveau_specsig *signal;
-       const struct nouveau_funcdom *func;
-};
-
-extern const struct nouveau_specdom nva3_perfmon_pwr[];
-extern const struct nouveau_specdom nvc0_perfmon_pwr[];
-extern const struct nouveau_specdom nve0_perfmon_pwr[];
-
-struct nouveau_perfdom {
-       struct list_head head;
-       struct list_head list;
-       const struct nouveau_funcdom *func;
-       char name[32];
-       u32 addr;
-       u8  quad;
-       u32 signal_nr;
-       struct nouveau_perfsig signal[];
-};
-
-struct nouveau_funcdom {
-       void (*init)(struct nouveau_perfmon *, struct nouveau_perfdom *,
-                    struct nouveau_perfctr *);
-       void (*read)(struct nouveau_perfmon *, struct nouveau_perfdom *,
-                    struct nouveau_perfctr *);
-       void (*next)(struct nouveau_perfmon *, struct nouveau_perfdom *);
-};
-
-int nouveau_perfdom_new(struct nouveau_perfmon *, const char *, u32,
-                       u32, u32, u32, const struct nouveau_specdom *);
-
-#define nouveau_perfmon_create(p,e,o,d)                                        \
-       nouveau_perfmon_create_((p), (e), (o), sizeof(**d), (void **)d)
-#define nouveau_perfmon_dtor(p) ({                                             \
-       struct nouveau_perfmon *c = (p);                                       \
-       _nouveau_perfmon_dtor(nv_object(c));                                   \
-})
-#define nouveau_perfmon_init(p) ({                                             \
-       struct nouveau_perfmon *c = (p);                                       \
-       _nouveau_perfmon_init(nv_object(c));                                   \
-})
-#define nouveau_perfmon_fini(p,s) ({                                           \
-       struct nouveau_perfmon *c = (p);                                       \
-       _nouveau_perfmon_fini(nv_object(c), (s));                              \
-})
-
-int nouveau_perfmon_create_(struct nouveau_object *, struct nouveau_object *,
-                           struct nouveau_oclass *, int, void **);
-void _nouveau_perfmon_dtor(struct nouveau_object *);
-int  _nouveau_perfmon_init(struct nouveau_object *);
-int  _nouveau_perfmon_fini(struct nouveau_object *, bool);
-
-#endif

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/Kbuild b/drivers/gpu/drm/nouveau/nvkm/engine/pm/Kbuild
new file mode 100644 (file)
index 0000000..fde0dc2
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/Kbuild
@@ -0,0 +1,9 @@
+nvkm-y += nvkm/engine/pm/base.o
+nvkm-y += nvkm/engine/pm/daemon.o
+nvkm-y += nvkm/engine/pm/nv40.o
+nvkm-y += nvkm/engine/pm/nv50.o
+nvkm-y += nvkm/engine/pm/nv84.o
+nvkm-y += nvkm/engine/pm/nva3.o
+nvkm-y += nvkm/engine/pm/nvc0.o
+nvkm-y += nvkm/engine/pm/nve0.o
+nvkm-y += nvkm/engine/pm/nvf0.o

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
similarity index 91%
rename from drivers/gpu/drm/nouveau/nvkm/engine/perfmon/base.c
rename to drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
index 3a9359e..5efb308 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
@@ -59,7 +59,7 @@ nouveau_perfsig_find_(struct nouveau_perfdom *dom, const char *name, u32 size)
 }
 
 struct nouveau_perfsig *
-nouveau_perfsig_find(struct nouveau_perfmon *ppm, const char *name, u32 size,
+nouveau_perfsig_find(struct nouveau_pm *ppm, const char *name, u32 size,
                     struct nouveau_perfdom **pdom)
 {
        struct nouveau_perfdom *dom = *pdom;
@@ -81,7 +81,7 @@ nouveau_perfsig_find(struct nouveau_perfmon *ppm, const char *name, u32 size,
 }
 
 struct nouveau_perfctr *
-nouveau_perfsig_wrap(struct nouveau_perfmon *ppm, const char *name,
+nouveau_perfsig_wrap(struct nouveau_pm *ppm, const char *name,
                     struct nouveau_perfdom **pdom)
 {
        struct nouveau_perfsig *sig;
@@ -110,7 +110,7 @@ nouveau_perfctr_query(struct nouveau_object *object, void *data, u32 size)
                struct nvif_perfctr_query_v0 v0;
        } *args = data;
        struct nouveau_device *device = nv_device(object);
-       struct nouveau_perfmon *ppm = (void *)object->engine;
+       struct nouveau_pm *ppm = (void *)object->engine;
        struct nouveau_perfdom *dom = NULL, *chk;
        const bool all = nouveau_boolopt(device->cfgopt, "NvPmShowAll", false);
        const bool raw = nouveau_boolopt(device->cfgopt, "NvPmUnnamed", all);
@@ -168,7 +168,7 @@ nouveau_perfctr_sample(struct nouveau_object *object, void *data, u32 size)
        union {
                struct nvif_perfctr_sample none;
        } *args = data;
-       struct nouveau_perfmon *ppm = (void *)object->engine;
+       struct nouveau_pm *ppm = (void *)object->engine;
        struct nouveau_perfctr *ctr, *tmp;
        struct nouveau_perfdom *dom;
        int ret;
@@ -273,7 +273,7 @@ nouveau_perfctr_ctor(struct nouveau_object *parent,
        union {
                struct nvif_perfctr_v0 v0;
        } *args = data;
-       struct nouveau_perfmon *ppm = (void *)engine;
+       struct nouveau_pm *ppm = (void *)engine;
        struct nouveau_perfdom *dom = NULL;
        struct nouveau_perfsig *sig[4] = {};
        struct nouveau_perfctr *ctr;
@@ -321,7 +321,7 @@ nouveau_perfctr_ofuncs = {
 };
 
 struct nouveau_oclass
-nouveau_perfmon_sclass[] = {
+nouveau_pm_sclass[] = {
        { .handle = NVIF_IOCTL_NEW_V0_PERFCTR,
          .ofuncs = &nouveau_perfctr_ofuncs,
        },
@@ -334,7 +334,7 @@ nouveau_perfmon_sclass[] = {
 static void
 nouveau_perfctx_dtor(struct nouveau_object *object)
 {
-       struct nouveau_perfmon *ppm = (void *)object->engine;
+       struct nouveau_pm *ppm = (void *)object->engine;
        mutex_lock(&nv_subdev(ppm)->mutex);
        nouveau_engctx_destroy(&ppm->context->base);
        ppm->context = NULL;
@@ -347,7 +347,7 @@ nouveau_perfctx_ctor(struct nouveau_object *parent,
                     struct nouveau_oclass *oclass, void *data, u32 size,
                     struct nouveau_object **pobject)
 {
-       struct nouveau_perfmon *ppm = (void *)engine;
+       struct nouveau_pm *ppm = (void *)engine;
        struct nouveau_perfctx *ctx;
        int ret;
 
@@ -369,8 +369,8 @@ nouveau_perfctx_ctor(struct nouveau_object *parent,
 }
 
 struct nouveau_oclass
-nouveau_perfmon_cclass = {
-       .handle = NV_ENGCTX(PERFMON, 0x00),
+nouveau_pm_cclass = {
+       .handle = NV_ENGCTX(PM, 0x00),
        .ofuncs = &(struct nouveau_ofuncs) {
                .ctor = nouveau_perfctx_ctor,
                .dtor = nouveau_perfctx_dtor,
@@ -383,7 +383,7 @@ nouveau_perfmon_cclass = {
  * PPM engine/subdev functions
  ******************************************************************************/
 int
-nouveau_perfdom_new(struct nouveau_perfmon *ppm, const char *name, u32 mask,
+nouveau_perfdom_new(struct nouveau_pm *ppm, const char *name, u32 mask,
                    u32 base, u32 size_unit, u32 size_domain,
                    const struct nouveau_specdom *spec)
 {
@@ -436,23 +436,23 @@ nouveau_perfdom_new(struct nouveau_perfmon *ppm, const char *name, u32 mask,
 }
 
 int
-_nouveau_perfmon_fini(struct nouveau_object *object, bool suspend)
+_nouveau_pm_fini(struct nouveau_object *object, bool suspend)
 {
-       struct nouveau_perfmon *ppm = (void *)object;
+       struct nouveau_pm *ppm = (void *)object;
        return nouveau_engine_fini(&ppm->base, suspend);
 }
 
 int
-_nouveau_perfmon_init(struct nouveau_object *object)
+_nouveau_pm_init(struct nouveau_object *object)
 {
-       struct nouveau_perfmon *ppm = (void *)object;
+       struct nouveau_pm *ppm = (void *)object;
        return nouveau_engine_init(&ppm->base);
 }
 
 void
-_nouveau_perfmon_dtor(struct nouveau_object *object)
+_nouveau_pm_dtor(struct nouveau_object *object)
 {
-       struct nouveau_perfmon *ppm = (void *)object;
+       struct nouveau_pm *ppm = (void *)object;
        struct nouveau_perfdom *dom, *tmp;
 
        list_for_each_entry_safe(dom, tmp, &ppm->domains, head) {
@@ -464,16 +464,16 @@ _nouveau_perfmon_dtor(struct nouveau_object *object)
 }
 
 int
-nouveau_perfmon_create_(struct nouveau_object *parent,
+nouveau_pm_create_(struct nouveau_object *parent,
                        struct nouveau_object *engine,
                        struct nouveau_oclass *oclass,
                        int length, void **pobject)
 {
-       struct nouveau_perfmon *ppm;
+       struct nouveau_pm *ppm;
        int ret;
 
        ret = nouveau_engine_create_(parent, engine, oclass, true, "PPM",
-                                    "perfmon", length, pobject);
+                                    "pm", length, pobject);
        ppm = *pobject;
        if (ret)
                return ret;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/daemon.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/daemon.c
similarity index 90%
rename from drivers/gpu/drm/nouveau/nvkm/engine/perfmon/daemon.c
rename to drivers/gpu/drm/nouveau/nvkm/engine/pm/daemon.c
index 50696cc..1fd51b8 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/daemon.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/daemon.c
@@ -25,7 +25,7 @@
 #include "priv.h"
 
 static void
-pwr_perfctr_init(struct nouveau_perfmon *ppm, struct nouveau_perfdom *dom,
+pwr_perfctr_init(struct nouveau_pm *ppm, struct nouveau_perfdom *dom,
                 struct nouveau_perfctr *ctr)
 {
        u32 mask = 0x00000000;
@@ -41,7 +41,7 @@ pwr_perfctr_init(struct nouveau_perfmon *ppm, struct nouveau_perfdom *dom,
 }
 
 static void
-pwr_perfctr_read(struct nouveau_perfmon *ppm, struct nouveau_perfdom *dom,
+pwr_perfctr_read(struct nouveau_pm *ppm, struct nouveau_perfdom *dom,
                 struct nouveau_perfctr *ctr)
 {
        ctr->ctr = ppm->pwr[ctr->slot];
@@ -49,7 +49,7 @@ pwr_perfctr_read(struct nouveau_perfmon *ppm, struct nouveau_perfdom *dom,
 }
 
 static void
-pwr_perfctr_next(struct nouveau_perfmon *ppm, struct nouveau_perfdom *dom)
+pwr_perfctr_next(struct nouveau_pm *ppm, struct nouveau_perfdom *dom)
 {
        int i;
 
@@ -67,7 +67,7 @@ pwr_perfctr_func = {
 };
 
 const struct nouveau_specdom
-nva3_perfmon_pwr[] = {
+nva3_pm_pwr[] = {
        { 0x20, (const struct nouveau_specsig[]) {
                        { 0x00, "pwr_gr_idle" },
                        { 0x04, "pwr_bsp_idle" },
@@ -80,7 +80,7 @@ nva3_perfmon_pwr[] = {
 };
 
 const struct nouveau_specdom
-nvc0_perfmon_pwr[] = {
+nvc0_pm_pwr[] = {
        { 0x20, (const struct nouveau_specsig[]) {
                        { 0x00, "pwr_gr_idle" },
                        { 0x04, "pwr_bsp_idle" },
@@ -94,7 +94,7 @@ nvc0_perfmon_pwr[] = {
 };
 
 const struct nouveau_specdom
-nve0_perfmon_pwr[] = {
+nve0_pm_pwr[] = {
        { 0x20, (const struct nouveau_specsig[]) {
                        { 0x00, "pwr_gr_idle" },
                        { 0x04, "pwr_bsp_idle" },

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nv40.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c
similarity index 77%
rename from drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nv40.c
rename to drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c
index b2a1078..82a1777 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nv40.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c
@@ -37,11 +37,11 @@
  ******************************************************************************/
 
 static void
-nv40_perfctr_init(struct nouveau_perfmon *ppm, struct nouveau_perfdom *dom,
+nv40_perfctr_init(struct nouveau_pm *ppm, struct nouveau_perfdom *dom,
                  struct nouveau_perfctr *ctr)
 {
-       struct nv40_perfmon_priv *priv = (void *)ppm;
-       struct nv40_perfmon_cntr *cntr = (void *)ctr;
+       struct nv40_pm_priv *priv = (void *)ppm;
+       struct nv40_pm_cntr *cntr = (void *)ctr;
        u32 log = ctr->logic_op;
        u32 src = 0x00000000;
        int i;
@@ -55,11 +55,11 @@ nv40_perfctr_init(struct nouveau_perfmon *ppm, struct nouveau_perfdom *dom,
 }
 
 static void
-nv40_perfctr_read(struct nouveau_perfmon *ppm, struct nouveau_perfdom *dom,
+nv40_perfctr_read(struct nouveau_pm *ppm, struct nouveau_perfdom *dom,
                  struct nouveau_perfctr *ctr)
 {
-       struct nv40_perfmon_priv *priv = (void *)ppm;
-       struct nv40_perfmon_cntr *cntr = (void *)ctr;
+       struct nv40_pm_priv *priv = (void *)ppm;
+       struct nv40_pm_cntr *cntr = (void *)ctr;
 
        switch (cntr->base.slot) {
        case 0: cntr->base.ctr = nv_rd32(priv, 0x00a700 + dom->addr); break;
@@ -71,9 +71,9 @@ nv40_perfctr_read(struct nouveau_perfmon *ppm, struct nouveau_perfdom *dom,
 }
 
 static void
-nv40_perfctr_next(struct nouveau_perfmon *ppm, struct nouveau_perfdom *dom)
+nv40_perfctr_next(struct nouveau_pm *ppm, struct nouveau_perfdom *dom)
 {
-       struct nv40_perfmon_priv *priv = (void *)ppm;
+       struct nv40_pm_priv *priv = (void *)ppm;
        if (priv->sequence != ppm->sequence) {
                nv_wr32(priv, 0x400084, 0x00000020);
                priv->sequence = ppm->sequence;
@@ -88,7 +88,7 @@ nv40_perfctr_func = {
 };
 
 static const struct nouveau_specdom
-nv40_perfmon[] = {
+nv40_pm[] = {
        { 0x20, (const struct nouveau_specsig[]) {
                        {}
                }, &nv40_perfctr_func },
@@ -108,15 +108,15 @@ nv40_perfmon[] = {
 };
 
 int
-nv40_perfmon_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
+nv40_pm_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
                  struct nouveau_oclass *oclass, void *data, u32 size,
                  struct nouveau_object **pobject)
 {
-       struct nv40_perfmon_oclass *mclass = (void *)oclass;
-       struct nv40_perfmon_priv *priv;
+       struct nv40_pm_oclass *mclass = (void *)oclass;
+       struct nv40_pm_priv *priv;
        int ret;
 
-       ret = nouveau_perfmon_create(parent, engine, oclass, &priv);
+       ret = nouveau_pm_create(parent, engine, oclass, &priv);
        *pobject = nv_object(priv);
        if (ret)
                return ret;
@@ -125,19 +125,19 @@ nv40_perfmon_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        if (ret)
                return ret;
 
-       nv_engine(priv)->cclass = &nouveau_perfmon_cclass;
-       nv_engine(priv)->sclass =  nouveau_perfmon_sclass;
+       nv_engine(priv)->cclass = &nouveau_pm_cclass;
+       nv_engine(priv)->sclass =  nouveau_pm_sclass;
        return 0;
 }
 
 struct nouveau_oclass *
-nv40_perfmon_oclass = &(struct nv40_perfmon_oclass) {
-       .base.handle = NV_ENGINE(PERFMON, 0x40),
+nv40_pm_oclass = &(struct nv40_pm_oclass) {
+       .base.handle = NV_ENGINE(PM, 0x40),
        .base.ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = nv40_perfmon_ctor,
-               .dtor = _nouveau_perfmon_dtor,
-               .init = _nouveau_perfmon_init,
-               .fini = _nouveau_perfmon_fini,
+               .ctor = nv40_pm_ctor,
+               .dtor = _nouveau_pm_dtor,
+               .init = _nouveau_pm_init,
+               .fini = _nouveau_pm_fini,
        },
-       .doms = nv40_perfmon,
+       .doms = nv40_pm,
 }.base;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nv40.h b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h
similarity index 65%
rename from drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nv40.h
rename to drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h
index 1b5792d..e83a0ef 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nv40.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h
@@ -3,21 +3,21 @@
 
 #include "priv.h"
 
-struct nv40_perfmon_oclass {
+struct nv40_pm_oclass {
        struct nouveau_oclass base;
        const struct nouveau_specdom *doms;
 };
 
-struct nv40_perfmon_priv {
-       struct nouveau_perfmon base;
+struct nv40_pm_priv {
+       struct nouveau_pm base;
        u32 sequence;
 };
 
-int nv40_perfmon_ctor(struct nouveau_object *, struct nouveau_object *,
+int nv40_pm_ctor(struct nouveau_object *, struct nouveau_object *,
                      struct nouveau_oclass *, void *data, u32 size,
                      struct nouveau_object **pobject);
 
-struct nv40_perfmon_cntr {
+struct nv40_pm_cntr {
        struct nouveau_perfctr base;
 };
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv50.c
similarity index 89%
rename from drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nv50.c
rename to drivers/gpu/drm/nouveau/nvkm/engine/pm/nv50.c
index 9421769..db2f9a1 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv50.c
@@ -37,7 +37,7 @@
  ******************************************************************************/
 
 static const struct nouveau_specdom
-nv50_perfmon[] = {
+nv50_pm[] = {
        { 0x040, (const struct nouveau_specsig[]) {
                        {}
                }, &nv40_perfctr_func },
@@ -58,13 +58,13 @@ nv50_perfmon[] = {
 };
 
 struct nouveau_oclass *
-nv50_perfmon_oclass = &(struct nv40_perfmon_oclass) {
-       .base.handle = NV_ENGINE(PERFMON, 0x50),
+nv50_pm_oclass = &(struct nv40_pm_oclass) {
+       .base.handle = NV_ENGINE(PM, 0x50),
        .base.ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = nv40_perfmon_ctor,
-               .dtor = _nouveau_perfmon_dtor,
-               .init = _nouveau_perfmon_init,
-               .fini = _nouveau_perfmon_fini,
+               .ctor = nv40_pm_ctor,
+               .dtor = _nouveau_pm_dtor,
+               .init = _nouveau_pm_init,
+               .fini = _nouveau_pm_fini,
        },
-       .doms = nv50_perfmon,
+       .doms = nv50_pm,
 }.base;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nv84.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv84.c
similarity index 90%
rename from drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nv84.c
rename to drivers/gpu/drm/nouveau/nvkm/engine/pm/nv84.c
index 9232c7f..37a4fc9 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nv84.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv84.c
@@ -37,7 +37,7 @@
  ******************************************************************************/
 
 static const struct nouveau_specdom
-nv84_perfmon[] = {
+nv84_pm[] = {
        { 0x20, (const struct nouveau_specsig[]) {
                        {}
                }, &nv40_perfctr_func },
@@ -66,13 +66,13 @@ nv84_perfmon[] = {
 };
 
 struct nouveau_oclass *
-nv84_perfmon_oclass = &(struct nv40_perfmon_oclass) {
-       .base.handle = NV_ENGINE(PERFMON, 0x84),
+nv84_pm_oclass = &(struct nv40_pm_oclass) {
+       .base.handle = NV_ENGINE(PM, 0x84),
        .base.ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = nv40_perfmon_ctor,
-               .dtor = _nouveau_perfmon_dtor,
-               .init = _nouveau_perfmon_init,
-               .fini = _nouveau_perfmon_fini,
+               .ctor = nv40_pm_ctor,
+               .dtor = _nouveau_pm_dtor,
+               .init = _nouveau_pm_init,
+               .fini = _nouveau_pm_fini,
        },
-       .doms = nv84_perfmon,
+       .doms = nv84_pm,
 }.base;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nva3.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nva3.c
similarity index 84%
rename from drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nva3.c
rename to drivers/gpu/drm/nouveau/nvkm/engine/pm/nva3.c
index 6197ebd..d54dc57 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nva3.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nva3.c
@@ -37,7 +37,7 @@
  ******************************************************************************/
 
 static const struct nouveau_specdom
-nva3_perfmon[] = {
+nva3_pm[] = {
        { 0x20, (const struct nouveau_specsig[]) {
                        {}
                }, &nv40_perfctr_func },
@@ -66,15 +66,15 @@ nva3_perfmon[] = {
 };
 
 static int
-nva3_perfmon_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
+nva3_pm_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
                  struct nouveau_oclass *oclass, void *data, u32 size,
                  struct nouveau_object **object)
 {
-       int ret = nv40_perfmon_ctor(parent, engine, oclass, data, size, object);
+       int ret = nv40_pm_ctor(parent, engine, oclass, data, size, object);
        if (ret == 0) {
-               struct nv40_perfmon_priv *priv = (void *)*object;
+               struct nv40_pm_priv *priv = (void *)*object;
                ret = nouveau_perfdom_new(&priv->base, "pwr", 0, 0, 0, 0,
-                                          nva3_perfmon_pwr);
+                                          nva3_pm_pwr);
                if (ret)
                        return ret;
 
@@ -84,13 +84,13 @@ nva3_perfmon_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
 }
 
 struct nouveau_oclass *
-nva3_perfmon_oclass = &(struct nv40_perfmon_oclass) {
-       .base.handle = NV_ENGINE(PERFMON, 0xa3),
+nva3_pm_oclass = &(struct nv40_pm_oclass) {
+       .base.handle = NV_ENGINE(PM, 0xa3),
        .base.ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = nva3_perfmon_ctor,
-               .dtor = _nouveau_perfmon_dtor,
-               .init = _nouveau_perfmon_init,
-               .fini = _nouveau_perfmon_fini,
+               .ctor = nva3_pm_ctor,
+               .dtor = _nouveau_pm_dtor,
+               .init = _nouveau_pm_init,
+               .fini = _nouveau_pm_fini,
        },
-       .doms = nva3_perfmon,
+       .doms = nva3_pm,
 }.base;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nvc0.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nvc0.c
similarity index 75%
rename from drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nvc0.c
rename to drivers/gpu/drm/nouveau/nvkm/engine/pm/nvc0.c
index 74b2410..fb00e82 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nvc0.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nvc0.c
@@ -37,26 +37,26 @@
  ******************************************************************************/
 
 static const struct nouveau_specdom
-nvc0_perfmon_hub[] = {
+nvc0_pm_hub[] = {
        {}
 };
 
 static const struct nouveau_specdom
-nvc0_perfmon_gpc[] = {
+nvc0_pm_gpc[] = {
        {}
 };
 
 static const struct nouveau_specdom
-nvc0_perfmon_part[] = {
+nvc0_pm_part[] = {
        {}
 };
 
 static void
-nvc0_perfctr_init(struct nouveau_perfmon *ppm, struct nouveau_perfdom *dom,
+nvc0_perfctr_init(struct nouveau_pm *ppm, struct nouveau_perfdom *dom,
                  struct nouveau_perfctr *ctr)
 {
-       struct nvc0_perfmon_priv *priv = (void *)ppm;
-       struct nvc0_perfmon_cntr *cntr = (void *)ctr;
+       struct nvc0_pm_priv *priv = (void *)ppm;
+       struct nvc0_pm_cntr *cntr = (void *)ctr;
        u32 log = ctr->logic_op;
        u32 src = 0x00000000;
        int i;
@@ -71,11 +71,11 @@ nvc0_perfctr_init(struct nouveau_perfmon *ppm, struct nouveau_perfdom *dom,
 }
 
 static void
-nvc0_perfctr_read(struct nouveau_perfmon *ppm, struct nouveau_perfdom *dom,
+nvc0_perfctr_read(struct nouveau_pm *ppm, struct nouveau_perfdom *dom,
                  struct nouveau_perfctr *ctr)
 {
-       struct nvc0_perfmon_priv *priv = (void *)ppm;
-       struct nvc0_perfmon_cntr *cntr = (void *)ctr;
+       struct nvc0_pm_priv *priv = (void *)ppm;
+       struct nvc0_pm_cntr *cntr = (void *)ctr;
 
        switch (cntr->base.slot) {
        case 0: cntr->base.ctr = nv_rd32(priv, dom->addr + 0x08c); break;
@@ -87,9 +87,9 @@ nvc0_perfctr_read(struct nouveau_perfmon *ppm, struct nouveau_perfdom *dom,
 }
 
 static void
-nvc0_perfctr_next(struct nouveau_perfmon *ppm, struct nouveau_perfdom *dom)
+nvc0_perfctr_next(struct nouveau_pm *ppm, struct nouveau_perfdom *dom)
 {
-       struct nvc0_perfmon_priv *priv = (void *)ppm;
+       struct nvc0_pm_priv *priv = (void *)ppm;
        nv_wr32(priv, dom->addr + 0x06c, dom->signal_nr - 0x40 + 0x27);
        nv_wr32(priv, dom->addr + 0x0ec, 0x00000011);
 }
@@ -102,36 +102,36 @@ nvc0_perfctr_func = {
 };
 
 int
-nvc0_perfmon_fini(struct nouveau_object *object, bool suspend)
+nvc0_pm_fini(struct nouveau_object *object, bool suspend)
 {
-       struct nvc0_perfmon_priv *priv = (void *)object;
+       struct nvc0_pm_priv *priv = (void *)object;
        nv_mask(priv, 0x000200, 0x10000000, 0x00000000);
        nv_mask(priv, 0x000200, 0x10000000, 0x10000000);
-       return nouveau_perfmon_fini(&priv->base, suspend);
+       return nouveau_pm_fini(&priv->base, suspend);
 }
 
 static int
-nvc0_perfmon_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
+nvc0_pm_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
                  struct nouveau_oclass *oclass, void *data, u32 size,
                  struct nouveau_object **pobject)
 {
-       struct nvc0_perfmon_priv *priv;
+       struct nvc0_pm_priv *priv;
        u32 mask;
        int ret;
 
-       ret = nouveau_perfmon_create(parent, engine, oclass, &priv);
+       ret = nouveau_pm_create(parent, engine, oclass, &priv);
        *pobject = nv_object(priv);
        if (ret)
                return ret;
 
        ret = nouveau_perfdom_new(&priv->base, "pwr", 0, 0, 0, 0,
-                                  nvc0_perfmon_pwr);
+                                  nvc0_pm_pwr);
        if (ret)
                return ret;
 
        /* HUB */
        ret = nouveau_perfdom_new(&priv->base, "hub", 0, 0x1b0000, 0, 0x200,
-                                  nvc0_perfmon_hub);
+                                  nvc0_pm_hub);
        if (ret)
                return ret;
 
@@ -141,7 +141,7 @@ nvc0_perfmon_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        mask &= ~nv_rd32(priv, 0x022584);
 
        ret = nouveau_perfdom_new(&priv->base, "gpc", mask, 0x180000,
-                                 0x1000, 0x200, nvc0_perfmon_gpc);
+                                 0x1000, 0x200, nvc0_pm_gpc);
        if (ret)
                return ret;
 
@@ -151,23 +151,23 @@ nvc0_perfmon_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        mask &= ~nv_rd32(priv, 0x0225c8);
 
        ret = nouveau_perfdom_new(&priv->base, "part", mask, 0x1a0000,
-                                 0x1000, 0x200, nvc0_perfmon_part);
+                                 0x1000, 0x200, nvc0_pm_part);
        if (ret)
                return ret;
 
-       nv_engine(priv)->cclass = &nouveau_perfmon_cclass;
-       nv_engine(priv)->sclass =  nouveau_perfmon_sclass;
+       nv_engine(priv)->cclass = &nouveau_pm_cclass;
+       nv_engine(priv)->sclass =  nouveau_pm_sclass;
        priv->base.last = 7;
        return 0;
 }
 
 struct nouveau_oclass
-nvc0_perfmon_oclass = {
-       .handle = NV_ENGINE(PERFMON, 0xc0),
+nvc0_pm_oclass = {
+       .handle = NV_ENGINE(PM, 0xc0),
        .ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = nvc0_perfmon_ctor,
-               .dtor = _nouveau_perfmon_dtor,
-               .init = _nouveau_perfmon_init,
-               .fini = nvc0_perfmon_fini,
+               .ctor = nvc0_pm_ctor,
+               .dtor = _nouveau_pm_dtor,
+               .init = _nouveau_pm_init,
+               .fini = nvc0_pm_fini,
        },
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nvc0.h b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nvc0.h
similarity index 55%
rename from drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nvc0.h
rename to drivers/gpu/drm/nouveau/nvkm/engine/pm/nvc0.h
index f66bca4..e0e0e02 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nvc0.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nvc0.h
@@ -3,15 +3,15 @@
 
 #include "priv.h"
 
-struct nvc0_perfmon_priv {
-       struct nouveau_perfmon base;
+struct nvc0_pm_priv {
+       struct nouveau_pm base;
 };
 
-struct nvc0_perfmon_cntr {
+struct nvc0_pm_cntr {
        struct nouveau_perfctr base;
 };
 
 extern const struct nouveau_funcdom nvc0_perfctr_func;
-int nvc0_perfmon_fini(struct nouveau_object *, bool);
+int nvc0_pm_fini(struct nouveau_object *, bool);
 
 #endif

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nve0.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nve0.c
similarity index 85%
rename from drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nve0.c
rename to drivers/gpu/drm/nouveau/nvkm/engine/pm/nve0.c
index 71d718c..11b17cc 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nve0.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nve0.c
@@ -37,7 +37,7 @@
  ******************************************************************************/
 
 static const struct nouveau_specdom
-nve0_perfmon_hub[] = {
+nve0_pm_hub[] = {
        { 0x60, (const struct nouveau_specsig[]) {
                        { 0x47, "hub00_user_0" },
                        {}
@@ -77,7 +77,7 @@ nve0_perfmon_hub[] = {
 };
 
 static const struct nouveau_specdom
-nve0_perfmon_gpc[] = {
+nve0_pm_gpc[] = {
        { 0xe0, (const struct nouveau_specsig[]) {
                        { 0xc7, "gpc00_user_0" },
                        {}
@@ -86,7 +86,7 @@ nve0_perfmon_gpc[] = {
 };
 
 static const struct nouveau_specdom
-nve0_perfmon_part[] = {
+nve0_pm_part[] = {
        { 0x60, (const struct nouveau_specsig[]) {
                        { 0x47, "part00_user_0" },
                        {}
@@ -99,28 +99,28 @@ nve0_perfmon_part[] = {
 };
 
 static int
-nve0_perfmon_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
+nve0_pm_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
                  struct nouveau_oclass *oclass, void *data, u32 size,
                  struct nouveau_object **pobject)
 {
-       struct nvc0_perfmon_priv *priv;
+       struct nvc0_pm_priv *priv;
        u32 mask;
        int ret;
 
-       ret = nouveau_perfmon_create(parent, engine, oclass, &priv);
+       ret = nouveau_pm_create(parent, engine, oclass, &priv);
        *pobject = nv_object(priv);
        if (ret)
                return ret;
 
        /* PDAEMON */
        ret = nouveau_perfdom_new(&priv->base, "pwr", 0, 0, 0, 0,
-                                  nve0_perfmon_pwr);
+                                  nve0_pm_pwr);
        if (ret)
                return ret;
 
        /* HUB */
        ret = nouveau_perfdom_new(&priv->base, "hub", 0, 0x1b0000, 0, 0x200,
-                                  nve0_perfmon_hub);
+                                  nve0_pm_hub);
        if (ret)
                return ret;
 
@@ -130,7 +130,7 @@ nve0_perfmon_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        mask &= ~nv_rd32(priv, 0x022584);
 
        ret = nouveau_perfdom_new(&priv->base, "gpc", mask, 0x180000,
-                                 0x1000, 0x200, nve0_perfmon_gpc);
+                                 0x1000, 0x200, nve0_pm_gpc);
        if (ret)
                return ret;
 
@@ -140,23 +140,23 @@ nve0_perfmon_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        mask &= ~nv_rd32(priv, 0x0225c8);
 
        ret = nouveau_perfdom_new(&priv->base, "part", mask, 0x1a0000,
-                                 0x1000, 0x200, nve0_perfmon_part);
+                                 0x1000, 0x200, nve0_pm_part);
        if (ret)
                return ret;
 
-       nv_engine(priv)->cclass = &nouveau_perfmon_cclass;
-       nv_engine(priv)->sclass =  nouveau_perfmon_sclass;
+       nv_engine(priv)->cclass = &nouveau_pm_cclass;
+       nv_engine(priv)->sclass =  nouveau_pm_sclass;
        priv->base.last = 7;
        return 0;
 }
 
 struct nouveau_oclass
-nve0_perfmon_oclass = {
-       .handle = NV_ENGINE(PERFMON, 0xe0),
+nve0_pm_oclass = {
+       .handle = NV_ENGINE(PM, 0xe0),
        .ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = nve0_perfmon_ctor,
-               .dtor = _nouveau_perfmon_dtor,
-               .init = _nouveau_perfmon_init,
-               .fini = nvc0_perfmon_fini,
+               .ctor = nve0_pm_ctor,
+               .dtor = _nouveau_pm_dtor,
+               .init = _nouveau_pm_init,
+               .fini = nvc0_pm_fini,
        },
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nvf0.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nvf0.c
similarity index 80%
rename from drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nvf0.c
rename to drivers/gpu/drm/nouveau/nvkm/engine/pm/nvf0.c
index 47256f7..7d5a8dd 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/perfmon/nvf0.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nvf0.c
@@ -37,35 +37,35 @@
  ******************************************************************************/
 
 static int
-nvf0_perfmon_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
+nvf0_pm_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
                  struct nouveau_oclass *oclass, void *data, u32 size,
                  struct nouveau_object **pobject)
 {
-       struct nvc0_perfmon_priv *priv;
+       struct nvc0_pm_priv *priv;
        int ret;
 
-       ret = nouveau_perfmon_create(parent, engine, oclass, &priv);
+       ret = nouveau_pm_create(parent, engine, oclass, &priv);
        *pobject = nv_object(priv);
        if (ret)
                return ret;
 
        ret = nouveau_perfdom_new(&priv->base, "pwr", 0, 0, 0, 0,
-                                  nve0_perfmon_pwr);
+                                  nve0_pm_pwr);
        if (ret)
                return ret;
 
-       nv_engine(priv)->cclass = &nouveau_perfmon_cclass;
-       nv_engine(priv)->sclass =  nouveau_perfmon_sclass;
+       nv_engine(priv)->cclass = &nouveau_pm_cclass;
+       nv_engine(priv)->sclass =  nouveau_pm_sclass;
        return 0;
 }
 
 struct nouveau_oclass
-nvf0_perfmon_oclass = {
-       .handle = NV_ENGINE(PERFMON, 0xf0),
+nvf0_pm_oclass = {
+       .handle = NV_ENGINE(PM, 0xf0),
        .ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = nvf0_perfmon_ctor,
-               .dtor = _nouveau_perfmon_dtor,
-               .init = _nouveau_perfmon_init,
-               .fini = nvc0_perfmon_fini,
+               .ctor = nvf0_pm_ctor,
+               .dtor = _nouveau_pm_dtor,
+               .init = _nouveau_pm_init,
+               .fini = nvc0_pm_fini,
        },
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h
new file mode 100644 (file)
index 0000000..af3938f
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h
@@ -0,0 +1,91 @@
+#ifndef __NVKM_PM_PRIV_H__
+#define __NVKM_PM_PRIV_H__
+
+#include <engine/pm.h>
+
+struct nouveau_perfctr {
+       struct nouveau_object base;
+       struct list_head head;
+       struct nouveau_perfsig *signal[4];
+       int slot;
+       u32 logic_op;
+       u32 clk;
+       u32 ctr;
+};
+
+extern struct nouveau_oclass nouveau_pm_sclass[];
+
+struct nouveau_perfctx {
+       struct nouveau_engctx base;
+};
+
+extern struct nouveau_oclass nouveau_pm_cclass;
+
+struct nouveau_specsig {
+       u8 signal;
+       const char *name;
+};
+
+struct nouveau_perfsig {
+       const char *name;
+};
+
+struct nouveau_perfdom;
+struct nouveau_perfctr *
+nouveau_perfsig_wrap(struct nouveau_pm *, const char *,
+                    struct nouveau_perfdom **);
+
+struct nouveau_specdom {
+       u16 signal_nr;
+       const struct nouveau_specsig *signal;
+       const struct nouveau_funcdom *func;
+};
+
+extern const struct nouveau_specdom nva3_pm_pwr[];
+extern const struct nouveau_specdom nvc0_pm_pwr[];
+extern const struct nouveau_specdom nve0_pm_pwr[];
+
+struct nouveau_perfdom {
+       struct list_head head;
+       struct list_head list;
+       const struct nouveau_funcdom *func;
+       char name[32];
+       u32 addr;
+       u8  quad;
+       u32 signal_nr;
+       struct nouveau_perfsig signal[];
+};
+
+struct nouveau_funcdom {
+       void (*init)(struct nouveau_pm *, struct nouveau_perfdom *,
+                    struct nouveau_perfctr *);
+       void (*read)(struct nouveau_pm *, struct nouveau_perfdom *,
+                    struct nouveau_perfctr *);
+       void (*next)(struct nouveau_pm *, struct nouveau_perfdom *);
+};
+
+int nouveau_perfdom_new(struct nouveau_pm *, const char *, u32,
+                       u32, u32, u32, const struct nouveau_specdom *);
+
+#define nouveau_pm_create(p,e,o,d)                                        \
+       nouveau_pm_create_((p), (e), (o), sizeof(**d), (void **)d)
+#define nouveau_pm_dtor(p) ({                                             \
+       struct nouveau_pm *c = (p);                                       \
+       _nouveau_pm_dtor(nv_object(c));                                   \
+})
+#define nouveau_pm_init(p) ({                                             \
+       struct nouveau_pm *c = (p);                                       \
+       _nouveau_pm_init(nv_object(c));                                   \
+})
+#define nouveau_pm_fini(p,s) ({                                           \
+       struct nouveau_pm *c = (p);                                       \
+       _nouveau_pm_fini(nv_object(c), (s));                              \
+})
+
+int nouveau_pm_create_(struct nouveau_object *, struct nouveau_object *,
+                           struct nouveau_oclass *, int, void **);
+void _nouveau_pm_dtor(struct nouveau_object *);
+int  _nouveau_pm_init(struct nouveau_object *);
+int  _nouveau_pm_fini(struct nouveau_object *, bool);
+
+#endif