From 97070f23c60869830039b216ff88230f54ef7107 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 20 Aug 2015 14:54:22 +1000 Subject: [PATCH] drm/nouveau/pm: convert to new-style nvkm_engine Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h | 23 +++--- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 88 +++++++++++----------- drivers/gpu/drm/nouveau/nvkm/engine/device/gf100.c | 9 --- drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c | 6 -- drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c | 16 ---- drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c | 14 ---- drivers/gpu/drm/nouveau/nvkm/engine/pm/Kbuild | 1 - drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c | 80 +++++++++----------- drivers/gpu/drm/nouveau/nvkm/engine/pm/g84.c | 16 ++-- drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c | 69 +++++++++-------- drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h | 15 +--- drivers/gpu/drm/nouveau/nvkm/engine/pm/gf108.c | 23 +++--- drivers/gpu/drm/nouveau/nvkm/engine/pm/gf117.c | 23 +++--- drivers/gpu/drm/nouveau/nvkm/engine/pm/gk104.c | 23 +++--- drivers/gpu/drm/nouveau/nvkm/engine/pm/gk110.c | 51 ------------- drivers/gpu/drm/nouveau/nvkm/engine/pm/gt200.c | 16 ++-- drivers/gpu/drm/nouveau/nvkm/engine/pm/gt215.c | 16 ++-- drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c | 69 ++++++++--------- drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h | 16 +--- drivers/gpu/drm/nouveau/nvkm/engine/pm/nv50.c | 16 ++-- drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h | 29 ++----- 21 files changed, 219 insertions(+), 400 deletions(-) delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/gk110.c diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h index c67cea6aae4d..240855ad8c8d 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h @@ -1,11 +1,9 @@ #ifndef __NVKM_PM_H__ #define __NVKM_PM_H__ -#define nvkm_pm(p) container_of((p), struct nvkm_pm, engine) #include -struct nvkm_perfdom; -struct nvkm_perfctr; struct nvkm_pm { + const struct nvkm_pm_func *func; struct nvkm_engine engine; struct nvkm_object *perfmon; @@ -15,14 +13,13 @@ struct nvkm_pm { u32 sequence; }; -extern struct nvkm_oclass *nv40_pm_oclass; -extern struct nvkm_oclass *nv50_pm_oclass; -extern struct nvkm_oclass *g84_pm_oclass; -extern struct nvkm_oclass *gt200_pm_oclass; -extern struct nvkm_oclass *gt215_pm_oclass; -extern struct nvkm_oclass *gf100_pm_oclass; -extern struct nvkm_oclass *gf108_pm_oclass; -extern struct nvkm_oclass *gf117_pm_oclass; -extern struct nvkm_oclass *gk104_pm_oclass; -extern struct nvkm_oclass gk110_pm_oclass; +int nv40_pm_new(struct nvkm_device *, int, struct nvkm_pm **); +int nv50_pm_new(struct nvkm_device *, int, struct nvkm_pm **); +int g84_pm_new(struct nvkm_device *, int, struct nvkm_pm **); +int gt200_pm_new(struct nvkm_device *, int, struct nvkm_pm **); +int gt215_pm_new(struct nvkm_device *, int, struct nvkm_pm **); +int gf100_pm_new(struct nvkm_device *, int, struct nvkm_pm **); +int gf108_pm_new(struct nvkm_device *, int, struct nvkm_pm **); +int gf117_pm_new(struct nvkm_device *, int, struct nvkm_pm **); +int gk104_pm_new(struct nvkm_device *, int, struct nvkm_pm **); #endif diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c index 3cf15d46f9d2..c954ae4189a9 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c @@ -471,7 +471,7 @@ nv40_chipset = { .fifo = nv40_fifo_new, .gr = nv40_gr_new, // .mpeg = nv40_mpeg_new, -// .pm = nv40_pm_new, + .pm = nv40_pm_new, // .sw = nv10_sw_new, }; @@ -496,7 +496,7 @@ nv41_chipset = { .fifo = nv40_fifo_new, .gr = nv40_gr_new, // .mpeg = nv40_mpeg_new, -// .pm = nv40_pm_new, + .pm = nv40_pm_new, // .sw = nv10_sw_new, }; @@ -521,7 +521,7 @@ nv42_chipset = { .fifo = nv40_fifo_new, .gr = nv40_gr_new, // .mpeg = nv40_mpeg_new, -// .pm = nv40_pm_new, + .pm = nv40_pm_new, // .sw = nv10_sw_new, }; @@ -546,7 +546,7 @@ nv43_chipset = { .fifo = nv40_fifo_new, .gr = nv40_gr_new, // .mpeg = nv40_mpeg_new, -// .pm = nv40_pm_new, + .pm = nv40_pm_new, // .sw = nv10_sw_new, }; @@ -571,7 +571,7 @@ nv44_chipset = { .fifo = nv40_fifo_new, .gr = nv44_gr_new, // .mpeg = nv44_mpeg_new, -// .pm = nv40_pm_new, + .pm = nv40_pm_new, // .sw = nv10_sw_new, }; @@ -596,7 +596,7 @@ nv45_chipset = { .fifo = nv40_fifo_new, .gr = nv40_gr_new, // .mpeg = nv44_mpeg_new, -// .pm = nv40_pm_new, + .pm = nv40_pm_new, // .sw = nv10_sw_new, }; @@ -621,7 +621,7 @@ nv46_chipset = { .fifo = nv40_fifo_new, .gr = nv44_gr_new, // .mpeg = nv44_mpeg_new, -// .pm = nv40_pm_new, + .pm = nv40_pm_new, // .sw = nv10_sw_new, }; @@ -646,7 +646,7 @@ nv47_chipset = { .fifo = nv40_fifo_new, .gr = nv40_gr_new, // .mpeg = nv44_mpeg_new, -// .pm = nv40_pm_new, + .pm = nv40_pm_new, // .sw = nv10_sw_new, }; @@ -671,7 +671,7 @@ nv49_chipset = { .fifo = nv40_fifo_new, .gr = nv40_gr_new, // .mpeg = nv44_mpeg_new, -// .pm = nv40_pm_new, + .pm = nv40_pm_new, // .sw = nv10_sw_new, }; @@ -696,7 +696,7 @@ nv4a_chipset = { .fifo = nv40_fifo_new, .gr = nv44_gr_new, // .mpeg = nv44_mpeg_new, -// .pm = nv40_pm_new, + .pm = nv40_pm_new, // .sw = nv10_sw_new, }; @@ -721,7 +721,7 @@ nv4b_chipset = { .fifo = nv40_fifo_new, .gr = nv40_gr_new, // .mpeg = nv44_mpeg_new, -// .pm = nv40_pm_new, + .pm = nv40_pm_new, // .sw = nv10_sw_new, }; @@ -746,7 +746,7 @@ nv4c_chipset = { .fifo = nv40_fifo_new, .gr = nv44_gr_new, // .mpeg = nv44_mpeg_new, -// .pm = nv40_pm_new, + .pm = nv40_pm_new, // .sw = nv10_sw_new, }; @@ -771,7 +771,7 @@ nv4e_chipset = { .fifo = nv40_fifo_new, .gr = nv44_gr_new, // .mpeg = nv44_mpeg_new, -// .pm = nv40_pm_new, + .pm = nv40_pm_new, // .sw = nv10_sw_new, }; @@ -799,7 +799,7 @@ nv50_chipset = { .fifo = nv50_fifo_new, .gr = nv50_gr_new, // .mpeg = nv50_mpeg_new, -// .pm = nv50_pm_new, + .pm = nv50_pm_new, // .sw = nv50_sw_new, }; @@ -824,7 +824,7 @@ nv63_chipset = { .fifo = nv40_fifo_new, .gr = nv44_gr_new, // .mpeg = nv44_mpeg_new, -// .pm = nv40_pm_new, + .pm = nv40_pm_new, // .sw = nv10_sw_new, }; @@ -849,7 +849,7 @@ nv67_chipset = { .fifo = nv40_fifo_new, .gr = nv44_gr_new, // .mpeg = nv44_mpeg_new, -// .pm = nv40_pm_new, + .pm = nv40_pm_new, // .sw = nv10_sw_new, }; @@ -874,7 +874,7 @@ nv68_chipset = { .fifo = nv40_fifo_new, .gr = nv44_gr_new, // .mpeg = nv44_mpeg_new, -// .pm = nv40_pm_new, + .pm = nv40_pm_new, // .sw = nv10_sw_new, }; @@ -904,7 +904,7 @@ nv84_chipset = { .fifo = g84_fifo_new, .gr = g84_gr_new, // .mpeg = g84_mpeg_new, -// .pm = g84_pm_new, + .pm = g84_pm_new, // .sw = nv50_sw_new, .vp = g84_vp_new, }; @@ -935,7 +935,7 @@ nv86_chipset = { .fifo = g84_fifo_new, .gr = g84_gr_new, // .mpeg = g84_mpeg_new, -// .pm = g84_pm_new, + .pm = g84_pm_new, // .sw = nv50_sw_new, .vp = g84_vp_new, }; @@ -966,7 +966,7 @@ nv92_chipset = { .fifo = g84_fifo_new, .gr = g84_gr_new, // .mpeg = g84_mpeg_new, -// .pm = g84_pm_new, + .pm = g84_pm_new, // .sw = nv50_sw_new, .vp = g84_vp_new, }; @@ -997,7 +997,7 @@ nv94_chipset = { .fifo = g84_fifo_new, .gr = g84_gr_new, // .mpeg = g84_mpeg_new, -// .pm = g84_pm_new, + .pm = g84_pm_new, // .sw = nv50_sw_new, .vp = g84_vp_new, }; @@ -1030,7 +1030,7 @@ nv96_chipset = { .cipher = g84_cipher_new, .bsp = g84_bsp_new, .disp = g94_disp_new, -// .pm = g84_pm_new, + .pm = g84_pm_new, }; static const struct nvkm_device_chip @@ -1061,7 +1061,7 @@ nv98_chipset = { .msvld = g98_msvld_new, .msppp = g98_msppp_new, .disp = g94_disp_new, -// .pm = g84_pm_new, + .pm = g84_pm_new, }; static const struct nvkm_device_chip @@ -1090,7 +1090,7 @@ nva0_chipset = { .fifo = g84_fifo_new, .gr = gt200_gr_new, // .mpeg = g84_mpeg_new, -// .pm = gt200_pm_new, + .pm = gt200_pm_new, // .sw = nv50_sw_new, .vp = g84_vp_new, }; @@ -1124,7 +1124,7 @@ nva3_chipset = { .mspdec = gt215_mspdec_new, .msppp = gt215_msppp_new, .msvld = gt215_msvld_new, -// .pm = gt215_pm_new, + .pm = gt215_pm_new, // .sw = nv50_sw_new, }; @@ -1156,7 +1156,7 @@ nva5_chipset = { .mspdec = gt215_mspdec_new, .msppp = gt215_msppp_new, .msvld = gt215_msvld_new, -// .pm = gt215_pm_new, + .pm = gt215_pm_new, // .sw = nv50_sw_new, }; @@ -1188,7 +1188,7 @@ nva8_chipset = { .mspdec = gt215_mspdec_new, .msppp = gt215_msppp_new, .msvld = gt215_msvld_new, -// .pm = gt215_pm_new, + .pm = gt215_pm_new, // .sw = nv50_sw_new, }; @@ -1218,7 +1218,7 @@ nvaa_chipset = { .mspdec = g98_mspdec_new, .msppp = g98_msppp_new, .msvld = g98_msvld_new, -// .pm = g84_pm_new, + .pm = g84_pm_new, .sec = g98_sec_new, // .sw = nv50_sw_new, }; @@ -1249,7 +1249,7 @@ nvac_chipset = { .mspdec = g98_mspdec_new, .msppp = g98_msppp_new, .msvld = g98_msvld_new, -// .pm = g84_pm_new, + .pm = g84_pm_new, .sec = g98_sec_new, // .sw = nv50_sw_new, }; @@ -1282,7 +1282,7 @@ nvaf_chipset = { .mspdec = gt215_mspdec_new, .msppp = gt215_msppp_new, .msvld = mcp89_msvld_new, -// .pm = gt215_pm_new, + .pm = gt215_pm_new, // .sw = nv50_sw_new, }; @@ -1317,7 +1317,7 @@ nvc0_chipset = { .mspdec = gf100_mspdec_new, .msppp = gf100_msppp_new, .msvld = gf100_msvld_new, -// .pm = gf100_pm_new, + .pm = gf100_pm_new, // .sw = gf100_sw_new, }; @@ -1351,7 +1351,7 @@ nvc1_chipset = { .mspdec = gf100_mspdec_new, .msppp = gf100_msppp_new, .msvld = gf100_msvld_new, -// .pm = gf108_pm_new, + .pm = gf108_pm_new, // .sw = gf100_sw_new, }; @@ -1385,7 +1385,7 @@ nvc3_chipset = { .mspdec = gf100_mspdec_new, .msppp = gf100_msppp_new, .msvld = gf100_msvld_new, -// .pm = gf100_pm_new, + .pm = gf100_pm_new, // .sw = gf100_sw_new, }; @@ -1420,7 +1420,7 @@ nvc4_chipset = { .mspdec = gf100_mspdec_new, .msppp = gf100_msppp_new, .msvld = gf100_msvld_new, -// .pm = gf100_pm_new, + .pm = gf100_pm_new, // .sw = gf100_sw_new, }; @@ -1455,7 +1455,7 @@ nvc8_chipset = { .mspdec = gf100_mspdec_new, .msppp = gf100_msppp_new, .msvld = gf100_msvld_new, -// .pm = gf100_pm_new, + .pm = gf100_pm_new, // .sw = gf100_sw_new, }; @@ -1490,7 +1490,7 @@ nvce_chipset = { .mspdec = gf100_mspdec_new, .msppp = gf100_msppp_new, .msvld = gf100_msvld_new, -// .pm = gf100_pm_new, + .pm = gf100_pm_new, // .sw = gf100_sw_new, }; @@ -1524,7 +1524,7 @@ nvcf_chipset = { .mspdec = gf100_mspdec_new, .msppp = gf100_msppp_new, .msvld = gf100_msvld_new, -// .pm = gf100_pm_new, + .pm = gf100_pm_new, // .sw = gf100_sw_new, }; @@ -1556,7 +1556,7 @@ nvd7_chipset = { .mspdec = gf100_mspdec_new, .msppp = gf100_msppp_new, .msvld = gf100_msvld_new, -// .pm = gf117_pm_new, + .pm = gf117_pm_new, // .sw = gf100_sw_new, }; @@ -1590,7 +1590,7 @@ nvd9_chipset = { .mspdec = gf100_mspdec_new, .msppp = gf100_msppp_new, .msvld = gf100_msvld_new, -// .pm = gf117_pm_new, + .pm = gf117_pm_new, // .sw = gf100_sw_new, }; @@ -1626,7 +1626,7 @@ nve4_chipset = { .mspdec = gk104_mspdec_new, .msppp = gf100_msppp_new, .msvld = gk104_msvld_new, -// .pm = gk104_pm_new, + .pm = gk104_pm_new, // .sw = gf100_sw_new, }; @@ -1662,7 +1662,7 @@ nve6_chipset = { .mspdec = gk104_mspdec_new, .msppp = gf100_msppp_new, .msvld = gk104_msvld_new, -// .pm = gk104_pm_new, + .pm = gk104_pm_new, // .sw = gf100_sw_new, }; @@ -1698,7 +1698,7 @@ nve7_chipset = { .mspdec = gk104_mspdec_new, .msppp = gf100_msppp_new, .msvld = gk104_msvld_new, -// .pm = gk104_pm_new, + .pm = gk104_pm_new, // .sw = gf100_sw_new, }; @@ -1722,7 +1722,7 @@ nvea_chipset = { .dma = gf119_dma_new, .fifo = gk20a_fifo_new, .gr = gk20a_gr_new, -// .pm = gk104_pm_new, + .pm = gk104_pm_new, // .sw = gf100_sw_new, }; @@ -1758,7 +1758,6 @@ nvf0_chipset = { .mspdec = gk104_mspdec_new, .msppp = gf100_msppp_new, .msvld = gk104_msvld_new, -// .pm = gk110_pm_new, // .sw = gf100_sw_new, }; @@ -1794,7 +1793,6 @@ nvf1_chipset = { .mspdec = gk104_mspdec_new, .msppp = gf100_msppp_new, .msvld = gk104_msvld_new, -// .pm = gk110_pm_new, // .sw = gf100_sw_new, }; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/gf100.c index b88aceb343c8..67faff5d0b52 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/gf100.c @@ -29,39 +29,30 @@ gf100_identify(struct nvkm_device *device) switch (device->chipset) { case 0xc0: device->oclass[NVDEV_ENGINE_SW ] = gf100_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = gf100_pm_oclass; break; case 0xc4: device->oclass[NVDEV_ENGINE_SW ] = gf100_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = gf100_pm_oclass; break; case 0xc3: device->oclass[NVDEV_ENGINE_SW ] = gf100_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = gf100_pm_oclass; break; case 0xce: device->oclass[NVDEV_ENGINE_SW ] = gf100_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = gf100_pm_oclass; break; case 0xcf: device->oclass[NVDEV_ENGINE_SW ] = gf100_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = gf100_pm_oclass; break; case 0xc1: device->oclass[NVDEV_ENGINE_SW ] = gf100_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = gf108_pm_oclass; break; case 0xc8: device->oclass[NVDEV_ENGINE_SW ] = gf100_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = gf100_pm_oclass; break; case 0xd9: device->oclass[NVDEV_ENGINE_SW ] = gf100_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = gf117_pm_oclass; break; case 0xd7: device->oclass[NVDEV_ENGINE_SW ] = gf100_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = gf117_pm_oclass; break; default: return -EINVAL; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c index 1ad7b217e2b8..3841dc0ac01b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c @@ -29,27 +29,21 @@ gk104_identify(struct nvkm_device *device) switch (device->chipset) { case 0xe4: device->oclass[NVDEV_ENGINE_SW ] = gf100_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = gk104_pm_oclass; break; case 0xe7: device->oclass[NVDEV_ENGINE_SW ] = gf100_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = gk104_pm_oclass; break; case 0xe6: device->oclass[NVDEV_ENGINE_SW ] = gf100_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = gk104_pm_oclass; break; case 0xea: device->oclass[NVDEV_ENGINE_SW ] = gf100_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = gk104_pm_oclass; break; case 0xf0: device->oclass[NVDEV_ENGINE_SW ] = gf100_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = &gk110_pm_oclass; break; case 0xf1: device->oclass[NVDEV_ENGINE_SW ] = gf100_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = &gk110_pm_oclass; break; case 0x106: device->oclass[NVDEV_ENGINE_SW ] = gf100_sw_oclass; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c index e3fdbf6ba871..08c015b0e5a1 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c @@ -30,82 +30,66 @@ nv40_identify(struct nvkm_device *device) case 0x40: device->oclass[NVDEV_ENGINE_SW ] = nv10_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv40_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x41: device->oclass[NVDEV_ENGINE_SW ] = nv10_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv40_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x42: device->oclass[NVDEV_ENGINE_SW ] = nv10_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv40_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x43: device->oclass[NVDEV_ENGINE_SW ] = nv10_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv40_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x45: device->oclass[NVDEV_ENGINE_SW ] = nv10_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv44_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x47: device->oclass[NVDEV_ENGINE_SW ] = nv10_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv44_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x49: device->oclass[NVDEV_ENGINE_SW ] = nv10_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv44_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x4b: device->oclass[NVDEV_ENGINE_SW ] = nv10_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv44_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x44: device->oclass[NVDEV_ENGINE_SW ] = nv10_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv44_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x46: device->oclass[NVDEV_ENGINE_SW ] = nv10_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv44_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x4a: device->oclass[NVDEV_ENGINE_SW ] = nv10_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv44_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x4c: device->oclass[NVDEV_ENGINE_SW ] = nv10_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv44_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x4e: device->oclass[NVDEV_ENGINE_SW ] = nv10_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv44_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x63: device->oclass[NVDEV_ENGINE_SW ] = nv10_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv44_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x67: device->oclass[NVDEV_ENGINE_SW ] = nv10_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv44_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x68: device->oclass[NVDEV_ENGINE_SW ] = nv10_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv44_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; default: return -EINVAL; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c index 912bd8070db7..c285f61ffd8f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c @@ -30,66 +30,52 @@ nv50_identify(struct nvkm_device *device) case 0x50: device->oclass[NVDEV_ENGINE_SW ] = nv50_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv50_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = nv50_pm_oclass; break; case 0x84: device->oclass[NVDEV_ENGINE_SW ] = nv50_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &g84_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = g84_pm_oclass; break; case 0x86: device->oclass[NVDEV_ENGINE_SW ] = nv50_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &g84_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = g84_pm_oclass; break; case 0x92: device->oclass[NVDEV_ENGINE_SW ] = nv50_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &g84_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = g84_pm_oclass; break; case 0x94: device->oclass[NVDEV_ENGINE_SW ] = nv50_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &g84_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = g84_pm_oclass; break; case 0x96: device->oclass[NVDEV_ENGINE_SW ] = nv50_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &g84_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = g84_pm_oclass; break; case 0x98: device->oclass[NVDEV_ENGINE_SW ] = nv50_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = g84_pm_oclass; break; case 0xa0: device->oclass[NVDEV_ENGINE_SW ] = nv50_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &g84_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = gt200_pm_oclass; break; case 0xaa: device->oclass[NVDEV_ENGINE_SW ] = nv50_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = g84_pm_oclass; break; case 0xac: device->oclass[NVDEV_ENGINE_SW ] = nv50_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = g84_pm_oclass; break; case 0xa3: device->oclass[NVDEV_ENGINE_SW ] = nv50_sw_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &g84_mpeg_oclass; - device->oclass[NVDEV_ENGINE_PM ] = gt215_pm_oclass; break; case 0xa5: device->oclass[NVDEV_ENGINE_SW ] = nv50_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = gt215_pm_oclass; break; case 0xa8: device->oclass[NVDEV_ENGINE_SW ] = nv50_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = gt215_pm_oclass; break; case 0xaf: device->oclass[NVDEV_ENGINE_SW ] = nv50_sw_oclass; - device->oclass[NVDEV_ENGINE_PM ] = gt215_pm_oclass; break; default: return -EINVAL; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/Kbuild b/drivers/gpu/drm/nouveau/nvkm/engine/pm/Kbuild index 4fadf55f51f9..1614d385fb0c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/Kbuild +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/Kbuild @@ -8,4 +8,3 @@ nvkm-y += nvkm/engine/pm/gf100.o nvkm-y += nvkm/engine/pm/gf108.o nvkm-y += nvkm/engine/pm/gf117.o nvkm-y += nvkm/engine/pm/gk104.o -nvkm-y += nvkm/engine/pm/gk110.o diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c index 5b4ab63809be..0db9be202c42 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c @@ -203,13 +203,13 @@ nvkm_perfsrc_disable(struct nvkm_pm *pm, struct nvkm_perfctr *ctr) * Perfdom object classes ******************************************************************************/ static int -nvkm_perfdom_init(struct nvkm_object *object, void *data, u32 size) +nvkm_perfdom_init(struct nvkm_perfdom *dom, void *data, u32 size) { union { struct nvif_perfdom_init none; } *args = data; - struct nvkm_pm *pm = (void *)object->engine; - struct nvkm_perfdom *dom = (void *)object; + struct nvkm_object *object = &dom->object; + struct nvkm_pm *pm = dom->perfmon->pm; int ret, i; nvif_ioctl(object, "perfdom init size %d\n", size); @@ -233,13 +233,13 @@ nvkm_perfdom_init(struct nvkm_object *object, void *data, u32 size) } static int -nvkm_perfdom_sample(struct nvkm_object *object, void *data, u32 size) +nvkm_perfdom_sample(struct nvkm_perfdom *dom, void *data, u32 size) { union { struct nvif_perfdom_sample none; } *args = data; - struct nvkm_pm *pm = (void *)object->engine; - struct nvkm_perfdom *dom; + struct nvkm_object *object = &dom->object; + struct nvkm_pm *pm = dom->perfmon->pm; int ret; nvif_ioctl(object, "perfdom sample size %d\n", size); @@ -257,13 +257,13 @@ nvkm_perfdom_sample(struct nvkm_object *object, void *data, u32 size) } static int -nvkm_perfdom_read(struct nvkm_object *object, void *data, u32 size) +nvkm_perfdom_read(struct nvkm_perfdom *dom, void *data, u32 size) { union { struct nvif_perfdom_read_v0 v0; } *args = data; - struct nvkm_pm *pm = (void *)object->engine; - struct nvkm_perfdom *dom = (void *)object; + struct nvkm_object *object = &dom->object; + struct nvkm_pm *pm = dom->perfmon->pm; int ret, i; nvif_ioctl(object, "perfdom read size %d\n", size); @@ -290,13 +290,14 @@ nvkm_perfdom_read(struct nvkm_object *object, void *data, u32 size) static int nvkm_perfdom_mthd(struct nvkm_object *object, u32 mthd, void *data, u32 size) { + struct nvkm_perfdom *dom = nvkm_perfdom(object); switch (mthd) { case NVIF_PERFDOM_V0_INIT: - return nvkm_perfdom_init(object, data, size); + return nvkm_perfdom_init(dom, data, size); case NVIF_PERFDOM_V0_SAMPLE: - return nvkm_perfdom_sample(object, data, size); + return nvkm_perfdom_sample(dom, data, size); case NVIF_PERFDOM_V0_READ: - return nvkm_perfdom_read(object, data, size); + return nvkm_perfdom_read(dom, data, size); default: break; } @@ -304,9 +305,9 @@ nvkm_perfdom_mthd(struct nvkm_object *object, u32 mthd, void *data, u32 size) } static void * -nvkm_perfdom_dtor(struct nvkm_object *base) +nvkm_perfdom_dtor(struct nvkm_object *object) { - struct nvkm_perfdom *dom = nvkm_perfdom(base); + struct nvkm_perfdom *dom = nvkm_perfdom(object); struct nvkm_pm *pm = dom->perfmon->pm; int i; @@ -607,7 +608,7 @@ nvkm_perfmon_child_new(const struct nvkm_oclass *oclass, void *data, u32 size, } static int -nvkm_perfmon_child_get(struct nvkm_object *base, int index, +nvkm_perfmon_child_get(struct nvkm_object *object, int index, struct nvkm_oclass *oclass) { if (index == 0) { @@ -621,9 +622,9 @@ nvkm_perfmon_child_get(struct nvkm_object *base, int index, } static void * -nvkm_perfmon_dtor(struct nvkm_object *base) +nvkm_perfmon_dtor(struct nvkm_object *object) { - struct nvkm_perfmon *perfmon = nvkm_perfmon(base); + struct nvkm_perfmon *perfmon = nvkm_perfmon(object); struct nvkm_pm *pm = perfmon->pm; mutex_lock(&pm->engine.subdev.mutex); if (pm->perfmon == &perfmon->object) @@ -816,24 +817,19 @@ nvkm_perfdom_new(struct nvkm_pm *pm, const char *name, u32 mask, return 0; } -int -_nvkm_pm_fini(struct nvkm_object *object, bool suspend) -{ - struct nvkm_pm *pm = (void *)object; - return nvkm_engine_fini_old(&pm->engine, suspend); -} - -int -_nvkm_pm_init(struct nvkm_object *object) +static int +nvkm_pm_fini(struct nvkm_engine *engine, bool suspend) { - struct nvkm_pm *pm = (void *)object; - return nvkm_engine_init_old(&pm->engine); + struct nvkm_pm *pm = nvkm_pm(engine); + if (pm->func->fini) + pm->func->fini(pm); + return 0; } -void -_nvkm_pm_dtor(struct nvkm_object *object) +static void * +nvkm_pm_dtor(struct nvkm_engine *engine) { - struct nvkm_pm *pm = (void *)object; + struct nvkm_pm *pm = nvkm_pm(engine); struct nvkm_perfdom *dom, *next_dom; struct nvkm_perfsrc *src, *next_src; @@ -848,30 +844,22 @@ _nvkm_pm_dtor(struct nvkm_object *object) kfree(src); } - nvkm_engine_destroy(&pm->engine); + return pm; } static const struct nvkm_engine_func nvkm_pm = { + .dtor = nvkm_pm_dtor, + .fini = nvkm_pm_fini, .base.sclass = nvkm_pm_oclass_get, }; int -nvkm_pm_create_(struct nvkm_object *parent, struct nvkm_object *engine, - struct nvkm_oclass *oclass, int length, void **pobject) +nvkm_pm_ctor(const struct nvkm_pm_func *func, struct nvkm_device *device, + int index, struct nvkm_pm *pm) { - struct nvkm_pm *pm; - int ret; - - ret = nvkm_engine_create_(parent, engine, oclass, true, "PPM", - "pm", length, pobject); - pm = *pobject; - if (ret) - return ret; - - pm->engine.func = &nvkm_pm; - + pm->func = func; INIT_LIST_HEAD(&pm->domains); INIT_LIST_HEAD(&pm->sources); - return 0; + return nvkm_engine_ctor(&nvkm_pm, device, index, 0, true, &pm->engine); } diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/g84.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/g84.c index 815bb0dcbf7e..6e441ddafd86 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/g84.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/g84.c @@ -158,14 +158,8 @@ g84_pm[] = { {} }; -struct nvkm_oclass * -g84_pm_oclass = &(struct nv40_pm_oclass) { - .base.handle = NV_ENGINE(PM, 0x84), - .base.ofuncs = &(struct nvkm_ofuncs) { - .ctor = nv40_pm_ctor, - .dtor = _nvkm_pm_dtor, - .init = _nvkm_pm_init, - .fini = _nvkm_pm_fini, - }, - .doms = g84_pm, -}.base; +int +g84_pm_new(struct nvkm_device *device, int index, struct nvkm_pm **ppm) +{ + return nv40_pm_new_(g84_pm, device, index, ppm); +} diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c index 18e0ed514249..d2901e9a7808 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c @@ -129,7 +129,6 @@ gf100_perfctr_init(struct nvkm_pm *pm, struct nvkm_perfdom *dom, struct nvkm_perfctr *ctr) { struct nvkm_device *device = pm->engine.subdev.device; - struct gf100_pm_cntr *cntr = (void *)ctr; u32 log = ctr->logic_op; u32 src = 0x00000000; int i; @@ -139,8 +138,8 @@ gf100_perfctr_init(struct nvkm_pm *pm, struct nvkm_perfdom *dom, nvkm_wr32(device, dom->addr + 0x09c, 0x00040002 | (dom->mode << 3)); nvkm_wr32(device, dom->addr + 0x100, 0x00000000); - nvkm_wr32(device, dom->addr + 0x040 + (cntr->base.slot * 0x08), src); - nvkm_wr32(device, dom->addr + 0x044 + (cntr->base.slot * 0x08), log); + nvkm_wr32(device, dom->addr + 0x040 + (ctr->slot * 0x08), src); + nvkm_wr32(device, dom->addr + 0x044 + (ctr->slot * 0x08), log); } static void @@ -148,13 +147,12 @@ gf100_perfctr_read(struct nvkm_pm *pm, struct nvkm_perfdom *dom, struct nvkm_perfctr *ctr) { struct nvkm_device *device = pm->engine.subdev.device; - struct gf100_pm_cntr *cntr = (void *)ctr; - switch (cntr->base.slot) { - case 0: cntr->base.ctr = nvkm_rd32(device, dom->addr + 0x08c); break; - case 1: cntr->base.ctr = nvkm_rd32(device, dom->addr + 0x088); break; - case 2: cntr->base.ctr = nvkm_rd32(device, dom->addr + 0x080); break; - case 3: cntr->base.ctr = nvkm_rd32(device, dom->addr + 0x090); break; + switch (ctr->slot) { + case 0: ctr->ctr = nvkm_rd32(device, dom->addr + 0x08c); break; + case 1: ctr->ctr = nvkm_rd32(device, dom->addr + 0x088); break; + case 2: ctr->ctr = nvkm_rd32(device, dom->addr + 0x080); break; + case 3: ctr->ctr = nvkm_rd32(device, dom->addr + 0x090); break; } dom->clk = nvkm_rd32(device, dom->addr + 0x070); } @@ -174,35 +172,37 @@ gf100_perfctr_func = { .next = gf100_perfctr_next, }; -int -gf100_pm_fini(struct nvkm_object *object, bool suspend) +static void +gf100_pm_fini(struct nvkm_pm *pm) { - struct nvkm_pm *pm = (void *)object; struct nvkm_device *device = pm->engine.subdev.device; nvkm_mask(device, 0x000200, 0x10000000, 0x00000000); nvkm_mask(device, 0x000200, 0x10000000, 0x10000000); - return nvkm_pm_fini(pm, suspend); } +static const struct nvkm_pm_func +gf100_pm_ = { + .fini = gf100_pm_fini, +}; + int -gf100_pm_ctor(struct nvkm_object *parent, struct nvkm_object *engine, - struct nvkm_oclass *oclass, void *data, u32 size, - struct nvkm_object **pobject) +gf100_pm_new_(const struct gf100_pm_func *func, struct nvkm_device *device, + int index, struct nvkm_pm **ppm) { - struct gf100_pm_oclass *mclass = (void *)oclass; - struct nvkm_device *device = (void *)parent; struct nvkm_pm *pm; u32 mask; int ret; - ret = nvkm_pm_create(parent, engine, oclass, &pm); - *pobject = nv_object(pm); + if (!(pm = *ppm = kzalloc(sizeof(*pm), GFP_KERNEL))) + return -ENOMEM; + + ret = nvkm_pm_ctor(&gf100_pm_, device, index, pm); if (ret) return ret; /* HUB */ ret = nvkm_perfdom_new(pm, "hub", 0, 0x1b0000, 0, 0x200, - mclass->doms_hub); + func->doms_hub); if (ret) return ret; @@ -212,7 +212,7 @@ gf100_pm_ctor(struct nvkm_object *parent, struct nvkm_object *engine, mask &= ~nvkm_rd32(device, 0x022584); ret = nvkm_perfdom_new(pm, "gpc", mask, 0x180000, - 0x1000, 0x200, mclass->doms_gpc); + 0x1000, 0x200, func->doms_gpc); if (ret) return ret; @@ -222,23 +222,22 @@ gf100_pm_ctor(struct nvkm_object *parent, struct nvkm_object *engine, mask &= ~nvkm_rd32(device, 0x0225c8); ret = nvkm_perfdom_new(pm, "part", mask, 0x1a0000, - 0x1000, 0x200, mclass->doms_part); + 0x1000, 0x200, func->doms_part); if (ret) return ret; return 0; } -struct nvkm_oclass * -gf100_pm_oclass = &(struct gf100_pm_oclass) { - .base.handle = NV_ENGINE(PM, 0xc0), - .base.ofuncs = &(struct nvkm_ofuncs) { - .ctor = gf100_pm_ctor, - .dtor = _nvkm_pm_dtor, - .init = _nvkm_pm_init, - .fini = gf100_pm_fini, - }, - .doms_gpc = gf100_pm_gpc, - .doms_hub = gf100_pm_hub, +static const struct gf100_pm_func +gf100_pm = { + .doms_gpc = gf100_pm_gpc, + .doms_hub = gf100_pm_hub, .doms_part = gf100_pm_part, -}.base; +}; + +int +gf100_pm_new(struct nvkm_device *device, int index, struct nvkm_pm **ppm) +{ + return gf100_pm_new_(&gf100_pm, device, index, ppm); +} diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h index de6162221823..56d0344853ea 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h @@ -2,27 +2,18 @@ #define __NVKM_PM_NVC0_H__ #include "priv.h" -struct gf100_pm_oclass { - struct nvkm_oclass base; +struct gf100_pm_func { const struct nvkm_specdom *doms_hub; const struct nvkm_specdom *doms_gpc; const struct nvkm_specdom *doms_part; }; -int gf100_pm_ctor(struct nvkm_object *, struct nvkm_object *, - struct nvkm_oclass *, void *data, u32 size, - struct nvkm_object **pobject); - -struct gf100_pm_cntr { - struct nvkm_perfctr base; -}; +int gf100_pm_new_(const struct gf100_pm_func *, struct nvkm_device *, + int index, struct nvkm_pm **); extern const struct nvkm_funcdom gf100_perfctr_func; -int gf100_pm_fini(struct nvkm_object *, bool); - extern const struct nvkm_specdom gf100_pm_gpc[]; extern const struct nvkm_specsrc gf100_pbfb_sources[]; extern const struct nvkm_specsrc gf100_pmfb_sources[]; - #endif diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf108.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf108.c index a4d86d1ab1b0..49b24c98a7f7 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf108.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf108.c @@ -52,16 +52,15 @@ gf108_pm_part[] = { {} }; -struct nvkm_oclass * -gf108_pm_oclass = &(struct gf100_pm_oclass) { - .base.handle = NV_ENGINE(PM, 0xc1), - .base.ofuncs = &(struct nvkm_ofuncs) { - .ctor = gf100_pm_ctor, - .dtor = _nvkm_pm_dtor, - .init = _nvkm_pm_init, - .fini = gf100_pm_fini, - }, - .doms_hub = gf108_pm_hub, - .doms_gpc = gf100_pm_gpc, +static const struct gf100_pm_func +gf108_pm = { + .doms_gpc = gf100_pm_gpc, + .doms_hub = gf108_pm_hub, .doms_part = gf108_pm_part, -}.base; +}; + +int +gf108_pm_new(struct nvkm_device *device, int index, struct nvkm_pm **ppm) +{ + return gf100_pm_new_(&gf108_pm, device, index, ppm); +} diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf117.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf117.c index a76c9283237d..9170025fc988 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf117.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf117.c @@ -66,16 +66,15 @@ gf117_pm_part[] = { {} }; -struct nvkm_oclass * -gf117_pm_oclass = &(struct gf100_pm_oclass) { - .base.handle = NV_ENGINE(PM, 0xd7), - .base.ofuncs = &(struct nvkm_ofuncs) { - .ctor = gf100_pm_ctor, - .dtor = _nvkm_pm_dtor, - .init = _nvkm_pm_init, - .fini = gf100_pm_fini, - }, - .doms_gpc = gf100_pm_gpc, - .doms_hub = gf117_pm_hub, +static const struct gf100_pm_func +gf117_pm = { + .doms_gpc = gf100_pm_gpc, + .doms_hub = gf117_pm_hub, .doms_part = gf117_pm_part, -}.base; +}; + +int +gf117_pm_new(struct nvkm_device *device, int index, struct nvkm_pm **ppm) +{ + return gf100_pm_new_(&gf117_pm, device, index, ppm); +} diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gk104.c index a236db9b7a68..07f946d26ac6 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gk104.c @@ -170,16 +170,15 @@ gk104_pm_part[] = { {} }; -struct nvkm_oclass * -gk104_pm_oclass = &(struct gf100_pm_oclass) { - .base.handle = NV_ENGINE(PM, 0xe0), - .base.ofuncs = &(struct nvkm_ofuncs) { - .ctor = gf100_pm_ctor, - .dtor = _nvkm_pm_dtor, - .init = _nvkm_pm_init, - .fini = gf100_pm_fini, - }, - .doms_gpc = gk104_pm_gpc, - .doms_hub = gk104_pm_hub, +static const struct gf100_pm_func +gk104_pm = { + .doms_gpc = gk104_pm_gpc, + .doms_hub = gk104_pm_hub, .doms_part = gk104_pm_part, -}.base; +}; + +int +gk104_pm_new(struct nvkm_device *device, int index, struct nvkm_pm **ppm) +{ + return gf100_pm_new_(&gk104_pm, device, index, ppm); +} diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gk110.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gk110.c deleted file mode 100644 index 44df8d311070..000000000000 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gk110.c +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2013 Red Hat Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - * - * Authors: Ben Skeggs - */ -#include "gf100.h" - -static int -gk110_pm_ctor(struct nvkm_object *parent, struct nvkm_object *engine, - struct nvkm_oclass *oclass, void *data, u32 size, - struct nvkm_object **pobject) -{ - struct nvkm_pm *pm; - int ret; - - ret = nvkm_pm_create(parent, engine, oclass, &pm); - *pobject = nv_object(pm); - if (ret) - return ret; - - return 0; -} - -struct nvkm_oclass -gk110_pm_oclass = { - .handle = NV_ENGINE(PM, 0xf0), - .ofuncs = &(struct nvkm_ofuncs) { - .ctor = gk110_pm_ctor, - .dtor = _nvkm_pm_dtor, - .init = _nvkm_pm_init, - .fini = gf100_pm_fini, - }, -}; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gt200.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gt200.c index e92f9c711bcc..5cf5dd536fd0 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gt200.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gt200.c @@ -150,14 +150,8 @@ gt200_pm[] = { {} }; -struct nvkm_oclass * -gt200_pm_oclass = &(struct nv40_pm_oclass) { - .base.handle = NV_ENGINE(PM, 0xa0), - .base.ofuncs = &(struct nvkm_ofuncs) { - .ctor = nv40_pm_ctor, - .dtor = _nvkm_pm_dtor, - .init = _nvkm_pm_init, - .fini = _nvkm_pm_fini, - }, - .doms = gt200_pm, -}.base; +int +gt200_pm_new(struct nvkm_device *device, int index, struct nvkm_pm **ppm) +{ + return nv40_pm_new_(gt200_pm, device, index, ppm); +} diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gt215.c index f5eae63d9f48..c9227ad41b04 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/gt215.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/gt215.c @@ -131,14 +131,8 @@ gt215_pm[] = { {} }; -struct nvkm_oclass * -gt215_pm_oclass = &(struct nv40_pm_oclass) { - .base.handle = NV_ENGINE(PM, 0xa3), - .base.ofuncs = &(struct nvkm_ofuncs) { - .ctor = nv40_pm_ctor, - .dtor = _nvkm_pm_dtor, - .init = _nvkm_pm_init, - .fini = _nvkm_pm_fini, - }, - .doms = gt215_pm, -}.base; +int +gt215_pm_new(struct nvkm_device *device, int index, struct nvkm_pm **ppm) +{ + return nv40_pm_new_(gt215_pm, device, index, ppm); +} diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c index a4660dc14259..4bef72a9d106 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c @@ -28,7 +28,6 @@ nv40_perfctr_init(struct nvkm_pm *pm, struct nvkm_perfdom *dom, struct nvkm_perfctr *ctr) { struct nvkm_device *device = pm->engine.subdev.device; - struct nv40_pm_cntr *cntr = (void *)ctr; u32 log = ctr->logic_op; u32 src = 0x00000000; int i; @@ -37,8 +36,8 @@ nv40_perfctr_init(struct nvkm_pm *pm, struct nvkm_perfdom *dom, src |= ctr->signal[i] << (i * 8); nvkm_wr32(device, 0x00a7c0 + dom->addr, 0x00000001 | (dom->mode << 4)); - nvkm_wr32(device, 0x00a400 + dom->addr + (cntr->base.slot * 0x40), src); - nvkm_wr32(device, 0x00a420 + dom->addr + (cntr->base.slot * 0x40), log); + nvkm_wr32(device, 0x00a400 + dom->addr + (ctr->slot * 0x40), src); + nvkm_wr32(device, 0x00a420 + dom->addr + (ctr->slot * 0x40), log); } static void @@ -46,13 +45,12 @@ nv40_perfctr_read(struct nvkm_pm *pm, struct nvkm_perfdom *dom, struct nvkm_perfctr *ctr) { struct nvkm_device *device = pm->engine.subdev.device; - struct nv40_pm_cntr *cntr = (void *)ctr; - switch (cntr->base.slot) { - case 0: cntr->base.ctr = nvkm_rd32(device, 0x00a700 + dom->addr); break; - case 1: cntr->base.ctr = nvkm_rd32(device, 0x00a6c0 + dom->addr); break; - case 2: cntr->base.ctr = nvkm_rd32(device, 0x00a680 + dom->addr); break; - case 3: cntr->base.ctr = nvkm_rd32(device, 0x00a740 + dom->addr); break; + switch (ctr->slot) { + case 0: ctr->ctr = nvkm_rd32(device, 0x00a700 + dom->addr); break; + case 1: ctr->ctr = nvkm_rd32(device, 0x00a6c0 + dom->addr); break; + case 2: ctr->ctr = nvkm_rd32(device, 0x00a680 + dom->addr); break; + case 3: ctr->ctr = nvkm_rd32(device, 0x00a740 + dom->addr); break; } dom->clk = nvkm_rd32(device, 0x00a600 + dom->addr); } @@ -74,6 +72,28 @@ nv40_perfctr_func = { .next = nv40_perfctr_next, }; +static const struct nvkm_pm_func +nv40_pm_ = { +}; + +int +nv40_pm_new_(const struct nvkm_specdom *doms, struct nvkm_device *device, + int index, struct nvkm_pm **ppm) +{ + struct nv40_pm *pm; + int ret; + + if (!(pm = kzalloc(sizeof(*pm), GFP_KERNEL))) + return -ENOMEM; + *ppm = &pm->base; + + ret = nvkm_pm_ctor(&nv40_pm_, device, index, &pm->base); + if (ret) + return ret; + + return nvkm_perfdom_new(&pm->base, "pc", 0, 0, 0, 4, doms); +} + static const struct nvkm_specdom nv40_pm[] = { { 0x20, (const struct nvkm_specsig[]) { @@ -95,34 +115,7 @@ nv40_pm[] = { }; int -nv40_pm_ctor(struct nvkm_object *parent, struct nvkm_object *engine, - struct nvkm_oclass *oclass, void *data, u32 size, - struct nvkm_object **pobject) +nv40_pm_new(struct nvkm_device *device, int index, struct nvkm_pm **ppm) { - struct nv40_pm_oclass *mclass = (void *)oclass; - struct nv40_pm *pm; - int ret; - - ret = nvkm_pm_create(parent, engine, oclass, &pm); - *pobject = nv_object(pm); - if (ret) - return ret; - - ret = nvkm_perfdom_new(&pm->base, "pc", 0, 0, 0, 4, mclass->doms); - if (ret) - return ret; - - return 0; + return nv40_pm_new_(nv40_pm, device, index, ppm); } - -struct nvkm_oclass * -nv40_pm_oclass = &(struct nv40_pm_oclass) { - .base.handle = NV_ENGINE(PM, 0x40), - .base.ofuncs = &(struct nvkm_ofuncs) { - .ctor = nv40_pm_ctor, - .dtor = _nvkm_pm_dtor, - .init = _nvkm_pm_init, - .fini = _nvkm_pm_fini, - }, - .doms = nv40_pm, -}.base; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h index 08287527615c..da481abe8f7a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h @@ -1,24 +1,14 @@ #ifndef __NVKM_PM_NV40_H__ #define __NVKM_PM_NV40_H__ +#define nv40_pm(p) container_of((p), struct nv40_pm, base) #include "priv.h" -struct nv40_pm_oclass { - struct nvkm_oclass base; - const struct nvkm_specdom *doms; -}; - struct nv40_pm { struct nvkm_pm base; u32 sequence; }; -int nv40_pm_ctor(struct nvkm_object *, struct nvkm_object *, - struct nvkm_oclass *, void *data, u32 size, - struct nvkm_object **pobject); - -struct nv40_pm_cntr { - struct nvkm_perfctr base; -}; - +int nv40_pm_new_(const struct nvkm_specdom *, struct nvkm_device *, + int index, struct nvkm_pm **); extern const struct nvkm_funcdom nv40_perfctr_func; #endif diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv50.c index dee73af1c62f..cc5a41d4c6f2 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv50.c @@ -168,14 +168,8 @@ nv50_pm[] = { {} }; -struct nvkm_oclass * -nv50_pm_oclass = &(struct nv40_pm_oclass) { - .base.handle = NV_ENGINE(PM, 0x50), - .base.ofuncs = &(struct nvkm_ofuncs) { - .ctor = nv40_pm_ctor, - .dtor = _nvkm_pm_dtor, - .init = _nvkm_pm_init, - .fini = _nvkm_pm_fini, - }, - .doms = nv50_pm, -}.base; +int +nv50_pm_new(struct nvkm_device *device, int index, struct nvkm_pm **ppm) +{ + return nv40_pm_new_(nv50_pm, device, index, ppm); +} diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h index 889dca2e87be..d7b81cbf82b5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h @@ -1,7 +1,15 @@ #ifndef __NVKM_PM_PRIV_H__ #define __NVKM_PM_PRIV_H__ +#define nvkm_pm(p) container_of((p), struct nvkm_pm, engine) #include +int nvkm_pm_ctor(const struct nvkm_pm_func *, struct nvkm_device *, + int index, struct nvkm_pm *); + +struct nvkm_pm_func { + void (*fini)(struct nvkm_pm *); +}; + struct nvkm_perfctr { struct list_head head; u8 domain; @@ -92,25 +100,4 @@ struct nvkm_perfmon { struct nvkm_object object; struct nvkm_pm *pm; }; - -#define nvkm_pm_create(p,e,o,d) \ - nvkm_pm_create_((p), (e), (o), sizeof(**d), (void **)d) -#define nvkm_pm_dtor(p) ({ \ - struct nvkm_pm *c = (p); \ - _nvkm_pm_dtor(nv_object(c)); \ -}) -#define nvkm_pm_init(p) ({ \ - struct nvkm_pm *c = (p); \ - _nvkm_pm_init(nv_object(c)); \ -}) -#define nvkm_pm_fini(p,s) ({ \ - struct nvkm_pm *c = (p); \ - _nvkm_pm_fini(nv_object(c), (s)); \ -}) - -int nvkm_pm_create_(struct nvkm_object *, struct nvkm_object *, - struct nvkm_oclass *, int, void **); -void _nvkm_pm_dtor(struct nvkm_object *); -int _nvkm_pm_init(struct nvkm_object *); -int _nvkm_pm_fini(struct nvkm_object *, bool); #endif -- 2.11.0