Skip to content

L
linux
Commit e73d371a authored by Ben Skeggs's avatar Ben Skeggs
Browse files
Options

drm/nouveau/pm: switch to instanced constructor 

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent ee532a8d
Show whitespace changes
Inline Side-by-side
Showing with 83 additions and 86 deletions
drivers/gpu/drm/nouveau/include/nvkm/core/device.h
View file @ e73d371a
...@@ -60,7 +60,6 @@ struct nvkm_device { ...@@ -60,7 +60,6 @@ struct nvkm_device {
struct notifier_block nb; struct notifier_block nb;
} acpi; } acpi;
struct nvkm_pm *pm;
struct nvkm_engine *sec; struct nvkm_engine *sec;
struct nvkm_sec2 *sec2; struct nvkm_sec2 *sec2;
struct nvkm_sw *sw; struct nvkm_sw *sw;
...@@ -106,7 +105,6 @@ struct nvkm_device_chip { ...@@ -106,7 +105,6 @@ struct nvkm_device_chip {
#undef NVKM_LAYOUT_INST #undef NVKM_LAYOUT_INST
#undef NVKM_LAYOUT_ONCE #undef NVKM_LAYOUT_ONCE
int (*pm )(struct nvkm_device *, int idx, struct nvkm_pm **);
int (*sec )(struct nvkm_device *, int idx, struct nvkm_engine **); int (*sec )(struct nvkm_device *, int idx, struct nvkm_engine **);
int (*sec2 )(struct nvkm_device *, int idx, struct nvkm_sec2 **); int (*sec2 )(struct nvkm_device *, int idx, struct nvkm_sec2 **);
int (*sw )(struct nvkm_device *, int idx, struct nvkm_sw **); int (*sw )(struct nvkm_device *, int idx, struct nvkm_sw **);
......
drivers/gpu/drm/nouveau/include/nvkm/core/layout.h
View file @ e73d371a
...@@ -41,4 +41,5 @@ NVKM_LAYOUT_ONCE(NVKM_ENGINE_MSPPP , struct nvkm_engine , msppp) ...@@ -41,4 +41,5 @@ NVKM_LAYOUT_ONCE(NVKM_ENGINE_MSPPP , struct nvkm_engine , msppp)
NVKM_LAYOUT_ONCE(NVKM_ENGINE_MSVLD , struct nvkm_engine , msvld) NVKM_LAYOUT_ONCE(NVKM_ENGINE_MSVLD , struct nvkm_engine , msvld)
NVKM_LAYOUT_INST(NVKM_ENGINE_NVDEC , struct nvkm_nvdec , nvdec, 3) NVKM_LAYOUT_INST(NVKM_ENGINE_NVDEC , struct nvkm_nvdec , nvdec, 3)
NVKM_LAYOUT_INST(NVKM_ENGINE_NVENC , struct nvkm_nvenc , nvenc, 3) NVKM_LAYOUT_INST(NVKM_ENGINE_NVENC , struct nvkm_nvenc , nvenc, 3)
NVKM_LAYOUT_ONCE(NVKM_ENGINE_PM , struct nvkm_pm , pm)
NVKM_LAYOUT_ONCE(NVKM_ENGINE_VP , struct nvkm_engine , vp) NVKM_LAYOUT_ONCE(NVKM_ENGINE_VP , struct nvkm_engine , vp)
drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h
View file @ e73d371a
...@@ -17,13 +17,13 @@ struct nvkm_pm { ...@@ -17,13 +17,13 @@ struct nvkm_pm {
u32 sequence; u32 sequence;
}; };
int nv40_pm_new(struct nvkm_device *, int, struct nvkm_pm **); int nv40_pm_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pm **);
int nv50_pm_new(struct nvkm_device *, int, struct nvkm_pm **); int nv50_pm_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pm **);
int g84_pm_new(struct nvkm_device *, int, struct nvkm_pm **); int g84_pm_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pm **);
int gt200_pm_new(struct nvkm_device *, int, struct nvkm_pm **); int gt200_pm_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pm **);
int gt215_pm_new(struct nvkm_device *, int, struct nvkm_pm **); int gt215_pm_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pm **);
int gf100_pm_new(struct nvkm_device *, int, struct nvkm_pm **); int gf100_pm_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pm **);
int gf108_pm_new(struct nvkm_device *, int, struct nvkm_pm **); int gf108_pm_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pm **);
int gf117_pm_new(struct nvkm_device *, int, struct nvkm_pm **); int gf117_pm_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pm **);
int gk104_pm_new(struct nvkm_device *, int, struct nvkm_pm **); int gk104_pm_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_pm **);
#endif #endif
drivers/gpu/drm/nouveau/nvkm/core/subdev.c
View file @ e73d371a
...@@ -33,7 +33,6 @@ nvkm_subdev_type[NVKM_SUBDEV_NR] = { ...@@ -33,7 +33,6 @@ nvkm_subdev_type[NVKM_SUBDEV_NR] = {
#include <core/layout.h> #include <core/layout.h>
#undef NVKM_LAYOUT_ONCE #undef NVKM_LAYOUT_ONCE
#undef NVKM_LAYOUT_INST #undef NVKM_LAYOUT_INST
[NVKM_ENGINE_PM ] = "pm",
[NVKM_ENGINE_SEC ] = "sec", [NVKM_ENGINE_SEC ] = "sec",
[NVKM_ENGINE_SEC2 ] = "sec2", [NVKM_ENGINE_SEC2 ] = "sec2",
[NVKM_ENGINE_SW ] = "sw", [NVKM_ENGINE_SW ] = "sw",
......
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
View file @ e73d371a
...@@ -491,7 +491,7 @@ nv40_chipset = { ...@@ -491,7 +491,7 @@ nv40_chipset = {
.fifo = { 0x00000001, nv40_fifo_new }, .fifo = { 0x00000001, nv40_fifo_new },
.gr = { 0x00000001, nv40_gr_new }, .gr = { 0x00000001, nv40_gr_new },
.mpeg = { 0x00000001, nv40_mpeg_new }, .mpeg = { 0x00000001, nv40_mpeg_new },
.pm = nv40_pm_new, .pm = { 0x00000001, nv40_pm_new },
.sw = nv10_sw_new, .sw = nv10_sw_new,
}; };
...@@ -517,7 +517,7 @@ nv41_chipset = { ...@@ -517,7 +517,7 @@ nv41_chipset = {
.fifo = { 0x00000001, nv40_fifo_new }, .fifo = { 0x00000001, nv40_fifo_new },
.gr = { 0x00000001, nv40_gr_new }, .gr = { 0x00000001, nv40_gr_new },
.mpeg = { 0x00000001, nv40_mpeg_new }, .mpeg = { 0x00000001, nv40_mpeg_new },
.pm = nv40_pm_new, .pm = { 0x00000001, nv40_pm_new },
.sw = nv10_sw_new, .sw = nv10_sw_new,
}; };
...@@ -543,7 +543,7 @@ nv42_chipset = { ...@@ -543,7 +543,7 @@ nv42_chipset = {
.fifo = { 0x00000001, nv40_fifo_new }, .fifo = { 0x00000001, nv40_fifo_new },
.gr = { 0x00000001, nv40_gr_new }, .gr = { 0x00000001, nv40_gr_new },
.mpeg = { 0x00000001, nv40_mpeg_new }, .mpeg = { 0x00000001, nv40_mpeg_new },
.pm = nv40_pm_new, .pm = { 0x00000001, nv40_pm_new },
.sw = nv10_sw_new, .sw = nv10_sw_new,
}; };
...@@ -569,7 +569,7 @@ nv43_chipset = { ...@@ -569,7 +569,7 @@ nv43_chipset = {
.fifo = { 0x00000001, nv40_fifo_new }, .fifo = { 0x00000001, nv40_fifo_new },
.gr = { 0x00000001, nv40_gr_new }, .gr = { 0x00000001, nv40_gr_new },
.mpeg = { 0x00000001, nv40_mpeg_new }, .mpeg = { 0x00000001, nv40_mpeg_new },
.pm = nv40_pm_new, .pm = { 0x00000001, nv40_pm_new },
.sw = nv10_sw_new, .sw = nv10_sw_new,
}; };
...@@ -595,7 +595,7 @@ nv44_chipset = { ...@@ -595,7 +595,7 @@ nv44_chipset = {
.fifo = { 0x00000001, nv40_fifo_new }, .fifo = { 0x00000001, nv40_fifo_new },
.gr = { 0x00000001, nv44_gr_new }, .gr = { 0x00000001, nv44_gr_new },
.mpeg = { 0x00000001, nv44_mpeg_new }, .mpeg = { 0x00000001, nv44_mpeg_new },
.pm = nv40_pm_new, .pm = { 0x00000001, nv40_pm_new },
.sw = nv10_sw_new, .sw = nv10_sw_new,
}; };
...@@ -621,7 +621,7 @@ nv45_chipset = { ...@@ -621,7 +621,7 @@ nv45_chipset = {
.fifo = { 0x00000001, nv40_fifo_new }, .fifo = { 0x00000001, nv40_fifo_new },
.gr = { 0x00000001, nv40_gr_new }, .gr = { 0x00000001, nv40_gr_new },
.mpeg = { 0x00000001, nv44_mpeg_new }, .mpeg = { 0x00000001, nv44_mpeg_new },
.pm = nv40_pm_new, .pm = { 0x00000001, nv40_pm_new },
.sw = nv10_sw_new, .sw = nv10_sw_new,
}; };
...@@ -647,7 +647,7 @@ nv46_chipset = { ...@@ -647,7 +647,7 @@ nv46_chipset = {
.fifo = { 0x00000001, nv40_fifo_new }, .fifo = { 0x00000001, nv40_fifo_new },
.gr = { 0x00000001, nv44_gr_new }, .gr = { 0x00000001, nv44_gr_new },
.mpeg = { 0x00000001, nv44_mpeg_new }, .mpeg = { 0x00000001, nv44_mpeg_new },
.pm = nv40_pm_new, .pm = { 0x00000001, nv40_pm_new },
.sw = nv10_sw_new, .sw = nv10_sw_new,
}; };
...@@ -673,7 +673,7 @@ nv47_chipset = { ...@@ -673,7 +673,7 @@ nv47_chipset = {
.fifo = { 0x00000001, nv40_fifo_new }, .fifo = { 0x00000001, nv40_fifo_new },
.gr = { 0x00000001, nv40_gr_new }, .gr = { 0x00000001, nv40_gr_new },
.mpeg = { 0x00000001, nv44_mpeg_new }, .mpeg = { 0x00000001, nv44_mpeg_new },
.pm = nv40_pm_new, .pm = { 0x00000001, nv40_pm_new },
.sw = nv10_sw_new, .sw = nv10_sw_new,
}; };
...@@ -699,7 +699,7 @@ nv49_chipset = { ...@@ -699,7 +699,7 @@ nv49_chipset = {
.fifo = { 0x00000001, nv40_fifo_new }, .fifo = { 0x00000001, nv40_fifo_new },
.gr = { 0x00000001, nv40_gr_new }, .gr = { 0x00000001, nv40_gr_new },
.mpeg = { 0x00000001, nv44_mpeg_new }, .mpeg = { 0x00000001, nv44_mpeg_new },
.pm = nv40_pm_new, .pm = { 0x00000001, nv40_pm_new },
.sw = nv10_sw_new, .sw = nv10_sw_new,
}; };
...@@ -725,7 +725,7 @@ nv4a_chipset = { ...@@ -725,7 +725,7 @@ nv4a_chipset = {
.fifo = { 0x00000001, nv40_fifo_new }, .fifo = { 0x00000001, nv40_fifo_new },
.gr = { 0x00000001, nv44_gr_new }, .gr = { 0x00000001, nv44_gr_new },
.mpeg = { 0x00000001, nv44_mpeg_new }, .mpeg = { 0x00000001, nv44_mpeg_new },
.pm = nv40_pm_new, .pm = { 0x00000001, nv40_pm_new },
.sw = nv10_sw_new, .sw = nv10_sw_new,
}; };
...@@ -751,7 +751,7 @@ nv4b_chipset = { ...@@ -751,7 +751,7 @@ nv4b_chipset = {
.fifo = { 0x00000001, nv40_fifo_new }, .fifo = { 0x00000001, nv40_fifo_new },
.gr = { 0x00000001, nv40_gr_new }, .gr = { 0x00000001, nv40_gr_new },
.mpeg = { 0x00000001, nv44_mpeg_new }, .mpeg = { 0x00000001, nv44_mpeg_new },
.pm = nv40_pm_new, .pm = { 0x00000001, nv40_pm_new },
.sw = nv10_sw_new, .sw = nv10_sw_new,
}; };
...@@ -777,7 +777,7 @@ nv4c_chipset = { ...@@ -777,7 +777,7 @@ nv4c_chipset = {
.fifo = { 0x00000001, nv40_fifo_new }, .fifo = { 0x00000001, nv40_fifo_new },
.gr = { 0x00000001, nv44_gr_new }, .gr = { 0x00000001, nv44_gr_new },
.mpeg = { 0x00000001, nv44_mpeg_new }, .mpeg = { 0x00000001, nv44_mpeg_new },
.pm = nv40_pm_new, .pm = { 0x00000001, nv40_pm_new },
.sw = nv10_sw_new, .sw = nv10_sw_new,
}; };
...@@ -803,7 +803,7 @@ nv4e_chipset = { ...@@ -803,7 +803,7 @@ nv4e_chipset = {
.fifo = { 0x00000001, nv40_fifo_new }, .fifo = { 0x00000001, nv40_fifo_new },
.gr = { 0x00000001, nv44_gr_new }, .gr = { 0x00000001, nv44_gr_new },
.mpeg = { 0x00000001, nv44_mpeg_new }, .mpeg = { 0x00000001, nv44_mpeg_new },
.pm = nv40_pm_new, .pm = { 0x00000001, nv40_pm_new },
.sw = nv10_sw_new, .sw = nv10_sw_new,
}; };
...@@ -832,7 +832,7 @@ nv50_chipset = { ...@@ -832,7 +832,7 @@ nv50_chipset = {
.fifo = { 0x00000001, nv50_fifo_new }, .fifo = { 0x00000001, nv50_fifo_new },
.gr = { 0x00000001, nv50_gr_new }, .gr = { 0x00000001, nv50_gr_new },
.mpeg = { 0x00000001, nv50_mpeg_new }, .mpeg = { 0x00000001, nv50_mpeg_new },
.pm = nv50_pm_new, .pm = { 0x00000001, nv50_pm_new },
.sw = nv50_sw_new, .sw = nv50_sw_new,
}; };
...@@ -858,7 +858,7 @@ nv63_chipset = { ...@@ -858,7 +858,7 @@ nv63_chipset = {
.fifo = { 0x00000001, nv40_fifo_new }, .fifo = { 0x00000001, nv40_fifo_new },
.gr = { 0x00000001, nv44_gr_new }, .gr = { 0x00000001, nv44_gr_new },
.mpeg = { 0x00000001, nv44_mpeg_new }, .mpeg = { 0x00000001, nv44_mpeg_new },
.pm = nv40_pm_new, .pm = { 0x00000001, nv40_pm_new },
.sw = nv10_sw_new, .sw = nv10_sw_new,
}; };
...@@ -884,7 +884,7 @@ nv67_chipset = { ...@@ -884,7 +884,7 @@ nv67_chipset = {
.fifo = { 0x00000001, nv40_fifo_new }, .fifo = { 0x00000001, nv40_fifo_new },
.gr = { 0x00000001, nv44_gr_new }, .gr = { 0x00000001, nv44_gr_new },
.mpeg = { 0x00000001, nv44_mpeg_new }, .mpeg = { 0x00000001, nv44_mpeg_new },
.pm = nv40_pm_new, .pm = { 0x00000001, nv40_pm_new },
.sw = nv10_sw_new, .sw = nv10_sw_new,
}; };
...@@ -910,7 +910,7 @@ nv68_chipset = { ...@@ -910,7 +910,7 @@ nv68_chipset = {
.fifo = { 0x00000001, nv40_fifo_new }, .fifo = { 0x00000001, nv40_fifo_new },
.gr = { 0x00000001, nv44_gr_new }, .gr = { 0x00000001, nv44_gr_new },
.mpeg = { 0x00000001, nv44_mpeg_new }, .mpeg = { 0x00000001, nv44_mpeg_new },
.pm = nv40_pm_new, .pm = { 0x00000001, nv40_pm_new },
.sw = nv10_sw_new, .sw = nv10_sw_new,
}; };
...@@ -941,7 +941,7 @@ nv84_chipset = { ...@@ -941,7 +941,7 @@ nv84_chipset = {
.fifo = { 0x00000001, g84_fifo_new }, .fifo = { 0x00000001, g84_fifo_new },
.gr = { 0x00000001, g84_gr_new }, .gr = { 0x00000001, g84_gr_new },
.mpeg = { 0x00000001, g84_mpeg_new }, .mpeg = { 0x00000001, g84_mpeg_new },
.pm = g84_pm_new, .pm = { 0x00000001, g84_pm_new },
.sw = nv50_sw_new, .sw = nv50_sw_new,
.vp = { 0x00000001, g84_vp_new }, .vp = { 0x00000001, g84_vp_new },
}; };
...@@ -973,7 +973,7 @@ nv86_chipset = { ...@@ -973,7 +973,7 @@ nv86_chipset = {
.fifo = { 0x00000001, g84_fifo_new }, .fifo = { 0x00000001, g84_fifo_new },
.gr = { 0x00000001, g84_gr_new }, .gr = { 0x00000001, g84_gr_new },
.mpeg = { 0x00000001, g84_mpeg_new }, .mpeg = { 0x00000001, g84_mpeg_new },
.pm = g84_pm_new, .pm = { 0x00000001, g84_pm_new },
.sw = nv50_sw_new, .sw = nv50_sw_new,
.vp = { 0x00000001, g84_vp_new }, .vp = { 0x00000001, g84_vp_new },
}; };
...@@ -1005,7 +1005,7 @@ nv92_chipset = { ...@@ -1005,7 +1005,7 @@ nv92_chipset = {
.fifo = { 0x00000001, g84_fifo_new }, .fifo = { 0x00000001, g84_fifo_new },
.gr = { 0x00000001, g84_gr_new }, .gr = { 0x00000001, g84_gr_new },
.mpeg = { 0x00000001, g84_mpeg_new }, .mpeg = { 0x00000001, g84_mpeg_new },
.pm = g84_pm_new, .pm = { 0x00000001, g84_pm_new },
.sw = nv50_sw_new, .sw = nv50_sw_new,
.vp = { 0x00000001, g84_vp_new }, .vp = { 0x00000001, g84_vp_new },
}; };
...@@ -1037,7 +1037,7 @@ nv94_chipset = { ...@@ -1037,7 +1037,7 @@ nv94_chipset = {
.fifo = { 0x00000001, g84_fifo_new }, .fifo = { 0x00000001, g84_fifo_new },
.gr = { 0x00000001, g84_gr_new }, .gr = { 0x00000001, g84_gr_new },
.mpeg = { 0x00000001, g84_mpeg_new }, .mpeg = { 0x00000001, g84_mpeg_new },
.pm = g84_pm_new, .pm = { 0x00000001, g84_pm_new },
.sw = nv50_sw_new, .sw = nv50_sw_new,
.vp = { 0x00000001, g84_vp_new }, .vp = { 0x00000001, g84_vp_new },
}; };
...@@ -1069,7 +1069,7 @@ nv96_chipset = { ...@@ -1069,7 +1069,7 @@ nv96_chipset = {
.fifo = { 0x00000001, g84_fifo_new }, .fifo = { 0x00000001, g84_fifo_new },
.gr = { 0x00000001, g84_gr_new }, .gr = { 0x00000001, g84_gr_new },
.mpeg = { 0x00000001, g84_mpeg_new }, .mpeg = { 0x00000001, g84_mpeg_new },
.pm = g84_pm_new, .pm = { 0x00000001, g84_pm_new },
.sw = nv50_sw_new, .sw = nv50_sw_new,
.vp = { 0x00000001, g84_vp_new }, .vp = { 0x00000001, g84_vp_new },
}; };
...@@ -1101,7 +1101,7 @@ nv98_chipset = { ...@@ -1101,7 +1101,7 @@ nv98_chipset = {
.mspdec = { 0x00000001, g98_mspdec_new }, .mspdec = { 0x00000001, g98_mspdec_new },
.msppp = { 0x00000001, g98_msppp_new }, .msppp = { 0x00000001, g98_msppp_new },
.msvld = { 0x00000001, g98_msvld_new }, .msvld = { 0x00000001, g98_msvld_new },
.pm = g84_pm_new, .pm = { 0x00000001, g84_pm_new },
.sec = g98_sec_new, .sec = g98_sec_new,
.sw = nv50_sw_new, .sw = nv50_sw_new,
}; };
...@@ -1133,7 +1133,7 @@ nva0_chipset = { ...@@ -1133,7 +1133,7 @@ nva0_chipset = {
.fifo = { 0x00000001, g84_fifo_new }, .fifo = { 0x00000001, g84_fifo_new },
.gr = { 0x00000001, gt200_gr_new }, .gr = { 0x00000001, gt200_gr_new },
.mpeg = { 0x00000001, g84_mpeg_new }, .mpeg = { 0x00000001, g84_mpeg_new },
.pm = gt200_pm_new, .pm = { 0x00000001, gt200_pm_new },
.sw = nv50_sw_new, .sw = nv50_sw_new,
.vp = { 0x00000001, g84_vp_new }, .vp = { 0x00000001, g84_vp_new },
}; };
...@@ -1168,7 +1168,7 @@ nva3_chipset = { ...@@ -1168,7 +1168,7 @@ nva3_chipset = {
.mspdec = { 0x00000001, gt215_mspdec_new }, .mspdec = { 0x00000001, gt215_mspdec_new },
.msppp = { 0x00000001, gt215_msppp_new }, .msppp = { 0x00000001, gt215_msppp_new },
.msvld = { 0x00000001, gt215_msvld_new }, .msvld = { 0x00000001, gt215_msvld_new },
.pm = gt215_pm_new, .pm = { 0x00000001, gt215_pm_new },
.sw = nv50_sw_new, .sw = nv50_sw_new,
}; };
...@@ -1201,7 +1201,7 @@ nva5_chipset = { ...@@ -1201,7 +1201,7 @@ nva5_chipset = {
.mspdec = { 0x00000001, gt215_mspdec_new }, .mspdec = { 0x00000001, gt215_mspdec_new },
.msppp = { 0x00000001, gt215_msppp_new }, .msppp = { 0x00000001, gt215_msppp_new },
.msvld = { 0x00000001, gt215_msvld_new }, .msvld = { 0x00000001, gt215_msvld_new },
.pm = gt215_pm_new, .pm = { 0x00000001, gt215_pm_new },
.sw = nv50_sw_new, .sw = nv50_sw_new,
}; };
...@@ -1234,7 +1234,7 @@ nva8_chipset = { ...@@ -1234,7 +1234,7 @@ nva8_chipset = {
.mspdec = { 0x00000001, gt215_mspdec_new }, .mspdec = { 0x00000001, gt215_mspdec_new },
.msppp = { 0x00000001, gt215_msppp_new }, .msppp = { 0x00000001, gt215_msppp_new },
.msvld = { 0x00000001, gt215_msvld_new }, .msvld = { 0x00000001, gt215_msvld_new },
.pm = gt215_pm_new, .pm = { 0x00000001, gt215_pm_new },
.sw = nv50_sw_new, .sw = nv50_sw_new,
}; };
...@@ -1265,7 +1265,7 @@ nvaa_chipset = { ...@@ -1265,7 +1265,7 @@ nvaa_chipset = {
.mspdec = { 0x00000001, g98_mspdec_new }, .mspdec = { 0x00000001, g98_mspdec_new },
.msppp = { 0x00000001, g98_msppp_new }, .msppp = { 0x00000001, g98_msppp_new },
.msvld = { 0x00000001, g98_msvld_new }, .msvld = { 0x00000001, g98_msvld_new },
.pm = g84_pm_new, .pm = { 0x00000001, g84_pm_new },
.sec = g98_sec_new, .sec = g98_sec_new,
.sw = nv50_sw_new, .sw = nv50_sw_new,
}; };
...@@ -1297,7 +1297,7 @@ nvac_chipset = { ...@@ -1297,7 +1297,7 @@ nvac_chipset = {
.mspdec = { 0x00000001, g98_mspdec_new }, .mspdec = { 0x00000001, g98_mspdec_new },
.msppp = { 0x00000001, g98_msppp_new }, .msppp = { 0x00000001, g98_msppp_new },
.msvld = { 0x00000001, g98_msvld_new }, .msvld = { 0x00000001, g98_msvld_new },
.pm = g84_pm_new, .pm = { 0x00000001, g84_pm_new },
.sec = g98_sec_new, .sec = g98_sec_new,
.sw = nv50_sw_new, .sw = nv50_sw_new,
}; };
...@@ -1331,7 +1331,7 @@ nvaf_chipset = { ...@@ -1331,7 +1331,7 @@ nvaf_chipset = {
.mspdec = { 0x00000001, gt215_mspdec_new }, .mspdec = { 0x00000001, gt215_mspdec_new },
.msppp = { 0x00000001, gt215_msppp_new }, .msppp = { 0x00000001, gt215_msppp_new },
.msvld = { 0x00000001, mcp89_msvld_new }, .msvld = { 0x00000001, mcp89_msvld_new },
.pm = gt215_pm_new, .pm = { 0x00000001, gt215_pm_new },
.sw = nv50_sw_new, .sw = nv50_sw_new,
}; };
...@@ -1367,7 +1367,7 @@ nvc0_chipset = { ...@@ -1367,7 +1367,7 @@ nvc0_chipset = {
.mspdec = { 0x00000001, gf100_mspdec_new }, .mspdec = { 0x00000001, gf100_mspdec_new },
.msppp = { 0x00000001, gf100_msppp_new }, .msppp = { 0x00000001, gf100_msppp_new },
.msvld = { 0x00000001, gf100_msvld_new }, .msvld = { 0x00000001, gf100_msvld_new },
.pm = gf100_pm_new, .pm = { 0x00000001, gf100_pm_new },
.sw = gf100_sw_new, .sw = gf100_sw_new,
}; };
...@@ -1403,7 +1403,7 @@ nvc1_chipset = { ...@@ -1403,7 +1403,7 @@ nvc1_chipset = {
.mspdec = { 0x00000001, gf100_mspdec_new }, .mspdec = { 0x00000001, gf100_mspdec_new },
.msppp = { 0x00000001, gf100_msppp_new }, .msppp = { 0x00000001, gf100_msppp_new },
.msvld = { 0x00000001, gf100_msvld_new }, .msvld = { 0x00000001, gf100_msvld_new },
.pm = gf108_pm_new, .pm = { 0x00000001, gf108_pm_new },
.sw = gf100_sw_new, .sw = gf100_sw_new,
}; };
...@@ -1439,7 +1439,7 @@ nvc3_chipset = { ...@@ -1439,7 +1439,7 @@ nvc3_chipset = {
.mspdec = { 0x00000001, gf100_mspdec_new }, .mspdec = { 0x00000001, gf100_mspdec_new },
.msppp = { 0x00000001, gf100_msppp_new }, .msppp = { 0x00000001, gf100_msppp_new },
.msvld = { 0x00000001, gf100_msvld_new }, .msvld = { 0x00000001, gf100_msvld_new },
.pm = gf100_pm_new, .pm = { 0x00000001, gf100_pm_new },
.sw = gf100_sw_new, .sw = gf100_sw_new,
}; };
...@@ -1475,7 +1475,7 @@ nvc4_chipset = { ...@@ -1475,7 +1475,7 @@ nvc4_chipset = {
.mspdec = { 0x00000001, gf100_mspdec_new }, .mspdec = { 0x00000001, gf100_mspdec_new },
.msppp = { 0x00000001, gf100_msppp_new }, .msppp = { 0x00000001, gf100_msppp_new },
.msvld = { 0x00000001, gf100_msvld_new }, .msvld = { 0x00000001, gf100_msvld_new },
.pm = gf100_pm_new, .pm = { 0x00000001, gf100_pm_new },
.sw = gf100_sw_new, .sw = gf100_sw_new,
}; };
...@@ -1511,7 +1511,7 @@ nvc8_chipset = { ...@@ -1511,7 +1511,7 @@ nvc8_chipset = {
.mspdec = { 0x00000001, gf100_mspdec_new }, .mspdec = { 0x00000001, gf100_mspdec_new },
.msppp = { 0x00000001, gf100_msppp_new }, .msppp = { 0x00000001, gf100_msppp_new },
.msvld = { 0x00000001, gf100_msvld_new }, .msvld = { 0x00000001, gf100_msvld_new },
.pm = gf100_pm_new, .pm = { 0x00000001, gf100_pm_new },
.sw = gf100_sw_new, .sw = gf100_sw_new,
}; };
...@@ -1547,7 +1547,7 @@ nvce_chipset = { ...@@ -1547,7 +1547,7 @@ nvce_chipset = {
.mspdec = { 0x00000001, gf100_mspdec_new }, .mspdec = { 0x00000001, gf100_mspdec_new },
.msppp = { 0x00000001, gf100_msppp_new }, .msppp = { 0x00000001, gf100_msppp_new },
.msvld = { 0x00000001, gf100_msvld_new }, .msvld = { 0x00000001, gf100_msvld_new },
.pm = gf100_pm_new, .pm = { 0x00000001, gf100_pm_new },
.sw = gf100_sw_new, .sw = gf100_sw_new,
}; };
...@@ -1583,7 +1583,7 @@ nvcf_chipset = { ...@@ -1583,7 +1583,7 @@ nvcf_chipset = {
.mspdec = { 0x00000001, gf100_mspdec_new }, .mspdec = { 0x00000001, gf100_mspdec_new },
.msppp = { 0x00000001, gf100_msppp_new }, .msppp = { 0x00000001, gf100_msppp_new },
.msvld = { 0x00000001, gf100_msvld_new }, .msvld = { 0x00000001, gf100_msvld_new },
.pm = gf100_pm_new, .pm = { 0x00000001, gf100_pm_new },
.sw = gf100_sw_new, .sw = gf100_sw_new,
}; };
...@@ -1618,7 +1618,7 @@ nvd7_chipset = { ...@@ -1618,7 +1618,7 @@ nvd7_chipset = {
.mspdec = { 0x00000001, gf100_mspdec_new }, .mspdec = { 0x00000001, gf100_mspdec_new },
.msppp = { 0x00000001, gf100_msppp_new }, .msppp = { 0x00000001, gf100_msppp_new },
.msvld = { 0x00000001, gf100_msvld_new }, .msvld = { 0x00000001, gf100_msvld_new },
.pm = gf117_pm_new, .pm = { 0x00000001, gf117_pm_new },
.sw = gf100_sw_new, .sw = gf100_sw_new,
}; };
...@@ -1654,7 +1654,7 @@ nvd9_chipset = { ...@@ -1654,7 +1654,7 @@ nvd9_chipset = {
.mspdec = { 0x00000001, gf100_mspdec_new }, .mspdec = { 0x00000001, gf100_mspdec_new },
.msppp = { 0x00000001, gf100_msppp_new }, .msppp = { 0x00000001, gf100_msppp_new },
.msvld = { 0x00000001, gf100_msvld_new }, .msvld = { 0x00000001, gf100_msvld_new },
.pm = gf117_pm_new, .pm = { 0x00000001, gf117_pm_new },
.sw = gf100_sw_new, .sw = gf100_sw_new,
}; };
...@@ -1691,7 +1691,7 @@ nve4_chipset = { ...@@ -1691,7 +1691,7 @@ nve4_chipset = {
.mspdec = { 0x00000001, gk104_mspdec_new }, .mspdec = { 0x00000001, gk104_mspdec_new },
.msppp = { 0x00000001, gf100_msppp_new }, .msppp = { 0x00000001, gf100_msppp_new },
.msvld = { 0x00000001, gk104_msvld_new }, .msvld = { 0x00000001, gk104_msvld_new },
.pm = gk104_pm_new, .pm = { 0x00000001, gk104_pm_new },
.sw = gf100_sw_new, .sw = gf100_sw_new,
}; };
...@@ -1728,7 +1728,7 @@ nve6_chipset = { ...@@ -1728,7 +1728,7 @@ nve6_chipset = {
.mspdec = { 0x00000001, gk104_mspdec_new }, .mspdec = { 0x00000001, gk104_mspdec_new },
.msppp = { 0x00000001, gf100_msppp_new }, .msppp = { 0x00000001, gf100_msppp_new },
.msvld = { 0x00000001, gk104_msvld_new }, .msvld = { 0x00000001, gk104_msvld_new },
.pm = gk104_pm_new, .pm = { 0x00000001, gk104_pm_new },
.sw = gf100_sw_new, .sw = gf100_sw_new,
}; };
...@@ -1765,7 +1765,7 @@ nve7_chipset = { ...@@ -1765,7 +1765,7 @@ nve7_chipset = {
.mspdec = { 0x00000001, gk104_mspdec_new }, .mspdec = { 0x00000001, gk104_mspdec_new },
.msppp = { 0x00000001, gf100_msppp_new }, .msppp = { 0x00000001, gf100_msppp_new },
.msvld = { 0x00000001, gk104_msvld_new }, .msvld = { 0x00000001, gk104_msvld_new },
.pm = gk104_pm_new, .pm = { 0x00000001, gk104_pm_new },
.sw = gf100_sw_new, .sw = gf100_sw_new,
}; };
...@@ -1790,7 +1790,7 @@ nvea_chipset = { ...@@ -1790,7 +1790,7 @@ nvea_chipset = {
.dma = { 0x00000001, gf119_dma_new }, .dma = { 0x00000001, gf119_dma_new },
.fifo = { 0x00000001, gk20a_fifo_new }, .fifo = { 0x00000001, gk20a_fifo_new },
.gr = { 0x00000001, gk20a_gr_new }, .gr = { 0x00000001, gk20a_gr_new },
.pm = gk104_pm_new, .pm = { 0x00000001, gk104_pm_new },
.sw = gf100_sw_new, .sw = gf100_sw_new,
}; };
...@@ -3162,7 +3162,6 @@ nvkm_device_ctor(const struct nvkm_device_func *func, ...@@ -3162,7 +3162,6 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
#include <core/layout.h> #include <core/layout.h>
#undef NVKM_LAYOUT_INST #undef NVKM_LAYOUT_INST
#undef NVKM_LAYOUT_ONCE #undef NVKM_LAYOUT_ONCE
_(NVKM_ENGINE_PM , pm);
_(NVKM_ENGINE_SEC , sec); _(NVKM_ENGINE_SEC , sec);
_(NVKM_ENGINE_SEC2 , sec2); _(NVKM_ENGINE_SEC2 , sec2);
_(NVKM_ENGINE_SW , sw); _(NVKM_ENGINE_SW , sw);
......
drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
View file @ e73d371a
...@@ -858,11 +858,11 @@ nvkm_pm = { ...@@ -858,11 +858,11 @@ nvkm_pm = {
int int
nvkm_pm_ctor(const struct nvkm_pm_func *func, struct nvkm_device *device, nvkm_pm_ctor(const struct nvkm_pm_func *func, struct nvkm_device *device,
int index, struct nvkm_pm *pm) enum nvkm_subdev_type type, int inst, struct nvkm_pm *pm)
{ {
pm->func = func; pm->func = func;
INIT_LIST_HEAD(&pm->domains); INIT_LIST_HEAD(&pm->domains);
INIT_LIST_HEAD(&pm->sources); INIT_LIST_HEAD(&pm->sources);
spin_lock_init(&pm->client.lock); spin_lock_init(&pm->client.lock);
return nvkm_engine_ctor(&nvkm_pm, device, index, true, &pm->engine); return nvkm_engine_ctor(&nvkm_pm, device, type, inst, true, &pm->engine);
} }
drivers/gpu/drm/nouveau/nvkm/engine/pm/g84.c
View file @ e73d371a
...@@ -159,7 +159,7 @@ g84_pm[] = { ...@@ -159,7 +159,7 @@ g84_pm[] = {
}; };
int int
g84_pm_new(struct nvkm_device *device, int index, struct nvkm_pm **ppm) g84_pm_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_pm **ppm)
{ {
return nv40_pm_new_(g84_pm, device, index, ppm); return nv40_pm_new_(g84_pm, device, type, inst, ppm);
} }
drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c
View file @ e73d371a
...@@ -187,7 +187,7 @@ gf100_pm_ = { ...@@ -187,7 +187,7 @@ gf100_pm_ = {
int int
gf100_pm_new_(const struct gf100_pm_func *func, struct nvkm_device *device, gf100_pm_new_(const struct gf100_pm_func *func, struct nvkm_device *device,
int index, struct nvkm_pm **ppm) enum nvkm_subdev_type type, int inst, struct nvkm_pm **ppm)
{ {
struct nvkm_pm *pm; struct nvkm_pm *pm;
u32 mask; u32 mask;
...@@ -196,7 +196,7 @@ gf100_pm_new_(const struct gf100_pm_func *func, struct nvkm_device *device, ...@@ -196,7 +196,7 @@ gf100_pm_new_(const struct gf100_pm_func *func, struct nvkm_device *device,
if (!(pm = *ppm = kzalloc(sizeof(*pm), GFP_KERNEL))) if (!(pm = *ppm = kzalloc(sizeof(*pm), GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
ret = nvkm_pm_ctor(&gf100_pm_, device, index, pm); ret = nvkm_pm_ctor(&gf100_pm_, device, type, inst, pm);
if (ret) if (ret)
return ret; return ret;
...@@ -237,7 +237,7 @@ gf100_pm = { ...@@ -237,7 +237,7 @@ gf100_pm = {
}; };
int int
gf100_pm_new(struct nvkm_device *device, int index, struct nvkm_pm **ppm) gf100_pm_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_pm **ppm)
{ {
return gf100_pm_new_(&gf100_pm, device, index, ppm); return gf100_pm_new_(&gf100_pm, device, type, inst, ppm);
} }
drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h
View file @ e73d371a
...@@ -9,8 +9,8 @@ struct gf100_pm_func { ...@@ -9,8 +9,8 @@ struct gf100_pm_func {
const struct nvkm_specdom *doms_part; const struct nvkm_specdom *doms_part;
}; };
int gf100_pm_new_(const struct gf100_pm_func *, struct nvkm_device *, int gf100_pm_new_(const struct gf100_pm_func *, struct nvkm_device *, enum nvkm_subdev_type, int,
int index, struct nvkm_pm **); struct nvkm_pm **);
extern const struct nvkm_funcdom gf100_perfctr_func; extern const struct nvkm_funcdom gf100_perfctr_func;
extern const struct nvkm_specdom gf100_pm_gpc[]; extern const struct nvkm_specdom gf100_pm_gpc[];
......
drivers/gpu/drm/nouveau/nvkm/engine/pm/gf108.c
View file @ e73d371a
...@@ -60,7 +60,7 @@ gf108_pm = { ...@@ -60,7 +60,7 @@ gf108_pm = {
}; };
int int
gf108_pm_new(struct nvkm_device *device, int index, struct nvkm_pm **ppm) gf108_pm_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_pm **ppm)
{ {
return gf100_pm_new_(&gf108_pm, device, index, ppm); return gf100_pm_new_(&gf108_pm, device, type, inst, ppm);
} }
drivers/gpu/drm/nouveau/nvkm/engine/pm/gf117.c
View file @ e73d371a
...@@ -74,7 +74,7 @@ gf117_pm = { ...@@ -74,7 +74,7 @@ gf117_pm = {
}; };
int int
gf117_pm_new(struct nvkm_device *device, int index, struct nvkm_pm **ppm) gf117_pm_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_pm **ppm)
{ {
return gf100_pm_new_(&gf117_pm, device, index, ppm); return gf100_pm_new_(&gf117_pm, device, type, inst, ppm);
} }
drivers/gpu/drm/nouveau/nvkm/engine/pm/gk104.c
View file @ e73d371a
...@@ -178,7 +178,7 @@ gk104_pm = { ...@@ -178,7 +178,7 @@ gk104_pm = {
}; };
int int
gk104_pm_new(struct nvkm_device *device, int index, struct nvkm_pm **ppm) gk104_pm_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_pm **ppm)
{ {
return gf100_pm_new_(&gk104_pm, device, index, ppm); return gf100_pm_new_(&gk104_pm, device, type, inst, ppm);
} }
drivers/gpu/drm/nouveau/nvkm/engine/pm/gt200.c
View file @ e73d371a
...@@ -151,7 +151,7 @@ gt200_pm[] = { ...@@ -151,7 +151,7 @@ gt200_pm[] = {
}; };
int int
gt200_pm_new(struct nvkm_device *device, int index, struct nvkm_pm **ppm) gt200_pm_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_pm **ppm)
{ {
return nv40_pm_new_(gt200_pm, device, index, ppm); return nv40_pm_new_(gt200_pm, device, type, inst, ppm);
} }
drivers/gpu/drm/nouveau/nvkm/engine/pm/gt215.c
View file @ e73d371a
...@@ -132,7 +132,7 @@ gt215_pm[] = { ...@@ -132,7 +132,7 @@ gt215_pm[] = {
}; };
int int
gt215_pm_new(struct nvkm_device *device, int index, struct nvkm_pm **ppm) gt215_pm_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_pm **ppm)
{ {
return nv40_pm_new_(gt215_pm, device, index, ppm); return nv40_pm_new_(gt215_pm, device, type, inst, ppm);
} }
drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c
View file @ e73d371a
...@@ -80,7 +80,7 @@ nv40_pm_ = { ...@@ -80,7 +80,7 @@ nv40_pm_ = {
int int
nv40_pm_new_(const struct nvkm_specdom *doms, struct nvkm_device *device, nv40_pm_new_(const struct nvkm_specdom *doms, struct nvkm_device *device,
int index, struct nvkm_pm **ppm) enum nvkm_subdev_type type, int inst, struct nvkm_pm **ppm)
{ {
struct nv40_pm *pm; struct nv40_pm *pm;
int ret; int ret;
...@@ -89,7 +89,7 @@ nv40_pm_new_(const struct nvkm_specdom *doms, struct nvkm_device *device, ...@@ -89,7 +89,7 @@ nv40_pm_new_(const struct nvkm_specdom *doms, struct nvkm_device *device,
return -ENOMEM; return -ENOMEM;
*ppm = &pm->base; *ppm = &pm->base;
ret = nvkm_pm_ctor(&nv40_pm_, device, index, &pm->base); ret = nvkm_pm_ctor(&nv40_pm_, device, type, inst, &pm->base);
if (ret) if (ret)
return ret; return ret;
...@@ -117,7 +117,7 @@ nv40_pm[] = { ...@@ -117,7 +117,7 @@ nv40_pm[] = {
}; };
int int
nv40_pm_new(struct nvkm_device *device, int index, struct nvkm_pm **ppm) nv40_pm_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_pm **ppm)
{ {
return nv40_pm_new_(nv40_pm, device, index, ppm); return nv40_pm_new_(nv40_pm, device, type, inst, ppm);
} }
drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h
View file @ e73d371a
...@@ -9,7 +9,7 @@ struct nv40_pm { ...@@ -9,7 +9,7 @@ struct nv40_pm {
u32 sequence; u32 sequence;
}; };
int nv40_pm_new_(const struct nvkm_specdom *, struct nvkm_device *, int nv40_pm_new_(const struct nvkm_specdom *, struct nvkm_device *, enum nvkm_subdev_type, int,
int index, struct nvkm_pm **); struct nvkm_pm **);
extern const struct nvkm_funcdom nv40_perfctr_func; extern const struct nvkm_funcdom nv40_perfctr_func;
#endif #endif
drivers/gpu/drm/nouveau/nvkm/engine/pm/nv50.c
View file @ e73d371a
...@@ -169,7 +169,7 @@ nv50_pm[] = { ...@@ -169,7 +169,7 @@ nv50_pm[] = {
}; };
int int
nv50_pm_new(struct nvkm_device *device, int index, struct nvkm_pm **ppm) nv50_pm_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_pm **ppm)
{ {
return nv40_pm_new_(nv50_pm, device, index, ppm); return nv40_pm_new_(nv50_pm, device, type, inst, ppm);
} }
drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h
View file @ e73d371a
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
#define nvkm_pm(p) container_of((p), struct nvkm_pm, engine) #define nvkm_pm(p) container_of((p), struct nvkm_pm, engine)
#include <engine/pm.h> #include <engine/pm.h>
int nvkm_pm_ctor(const struct nvkm_pm_func *, struct nvkm_device *, int nvkm_pm_ctor(const struct nvkm_pm_func *, struct nvkm_device *, enum nvkm_subdev_type, int,
int index, struct nvkm_pm *); struct nvkm_pm *);
struct nvkm_pm_func { struct nvkm_pm_func {
void (*fini)(struct nvkm_pm *); void (*fini)(struct nvkm_pm *);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7