v3: seperated change into own commit Signed-off-by: Karol Herbst <karolher...@gmail.com> --- drm/nouveau/nvkm/subdev/pmu/gf100.c | 1 + drm/nouveau/nvkm/subdev/pmu/gf119.c | 1 + drm/nouveau/nvkm/subdev/pmu/gk104.c | 1 + drm/nouveau/nvkm/subdev/pmu/gk110.c | 1 + drm/nouveau/nvkm/subdev/pmu/gk208.c | 1 + drm/nouveau/nvkm/subdev/pmu/gm107.c | 1 + drm/nouveau/nvkm/subdev/pmu/gt215.c | 1 + drm/nouveau/nvkm/subdev/pmu/priv.h | 2 ++ 8 files changed, 9 insertions(+)
diff --git a/drm/nouveau/nvkm/subdev/pmu/gf100.c b/drm/nouveau/nvkm/subdev/pmu/gf100.c index 0e36d4cb..14c3dd26 100644 --- a/drm/nouveau/nvkm/subdev/pmu/gf100.c +++ b/drm/nouveau/nvkm/subdev/pmu/gf100.c @@ -30,6 +30,7 @@ gf100_pmu = { .code.size = sizeof(gf100_pmu_code), .data.data = gf100_pmu_data, .data.size = sizeof(gf100_pmu_data), + .counter_slots = 8, .reset = gt215_pmu_reset, .init = gt215_pmu_init, .fini = gt215_pmu_fini, diff --git a/drm/nouveau/nvkm/subdev/pmu/gf119.c b/drm/nouveau/nvkm/subdev/pmu/gf119.c index 0e4ba424..9cf0279c 100644 --- a/drm/nouveau/nvkm/subdev/pmu/gf119.c +++ b/drm/nouveau/nvkm/subdev/pmu/gf119.c @@ -30,6 +30,7 @@ gf119_pmu = { .code.size = sizeof(gf119_pmu_code), .data.data = gf119_pmu_data, .data.size = sizeof(gf119_pmu_data), + .counter_slots = 8, .reset = gt215_pmu_reset, .init = gt215_pmu_init, .fini = gt215_pmu_fini, diff --git a/drm/nouveau/nvkm/subdev/pmu/gk104.c b/drm/nouveau/nvkm/subdev/pmu/gk104.c index 2ad858d8..cbf1d30d 100644 --- a/drm/nouveau/nvkm/subdev/pmu/gk104.c +++ b/drm/nouveau/nvkm/subdev/pmu/gk104.c @@ -109,6 +109,7 @@ gk104_pmu = { .code.size = sizeof(gk104_pmu_code), .data.data = gk104_pmu_data, .data.size = sizeof(gk104_pmu_data), + .counter_slots = 8, .reset = gt215_pmu_reset, .init = gt215_pmu_init, .fini = gt215_pmu_fini, diff --git a/drm/nouveau/nvkm/subdev/pmu/gk110.c b/drm/nouveau/nvkm/subdev/pmu/gk110.c index fc4b8ecf..f7ea4975 100644 --- a/drm/nouveau/nvkm/subdev/pmu/gk110.c +++ b/drm/nouveau/nvkm/subdev/pmu/gk110.c @@ -88,6 +88,7 @@ gk110_pmu = { .code.size = sizeof(gk110_pmu_code), .data.data = gk110_pmu_data, .data.size = sizeof(gk110_pmu_data), + .counter_slots = 8, .reset = gt215_pmu_reset, .init = gt215_pmu_init, .fini = gt215_pmu_fini, diff --git a/drm/nouveau/nvkm/subdev/pmu/gk208.c b/drm/nouveau/nvkm/subdev/pmu/gk208.c index e9a91277..252c3c1f 100644 --- a/drm/nouveau/nvkm/subdev/pmu/gk208.c +++ b/drm/nouveau/nvkm/subdev/pmu/gk208.c @@ -30,6 +30,7 @@ gk208_pmu = { .code.size = sizeof(gk208_pmu_code), .data.data = gk208_pmu_data, .data.size = sizeof(gk208_pmu_data), + .counter_slots = 8, .reset = gt215_pmu_reset, .init = gt215_pmu_init, .fini = gt215_pmu_fini, diff --git a/drm/nouveau/nvkm/subdev/pmu/gm107.c b/drm/nouveau/nvkm/subdev/pmu/gm107.c index 9a248ed7..b2917ec9 100644 --- a/drm/nouveau/nvkm/subdev/pmu/gm107.c +++ b/drm/nouveau/nvkm/subdev/pmu/gm107.c @@ -32,6 +32,7 @@ gm107_pmu = { .code.size = sizeof(gm107_pmu_code), .data.data = gm107_pmu_data, .data.size = sizeof(gm107_pmu_data), + .counter_slots = 8, .reset = gt215_pmu_reset, .init = gt215_pmu_init, .fini = gt215_pmu_fini, diff --git a/drm/nouveau/nvkm/subdev/pmu/gt215.c b/drm/nouveau/nvkm/subdev/pmu/gt215.c index 90d428b3..4bead2b7 100644 --- a/drm/nouveau/nvkm/subdev/pmu/gt215.c +++ b/drm/nouveau/nvkm/subdev/pmu/gt215.c @@ -241,6 +241,7 @@ gt215_pmu = { .code.size = sizeof(gt215_pmu_code), .data.data = gt215_pmu_data, .data.size = sizeof(gt215_pmu_data), + .counter_slots = 4, .reset = gt215_pmu_reset, .init = gt215_pmu_init, .fini = gt215_pmu_fini, diff --git a/drm/nouveau/nvkm/subdev/pmu/priv.h b/drm/nouveau/nvkm/subdev/pmu/priv.h index 096cba06..b66629bc 100644 --- a/drm/nouveau/nvkm/subdev/pmu/priv.h +++ b/drm/nouveau/nvkm/subdev/pmu/priv.h @@ -20,6 +20,8 @@ struct nvkm_pmu_func { u32 size; } data; + uint8_t counter_slots; + void (*reset)(struct nvkm_pmu *); int (*init)(struct nvkm_pmu *); void (*fini)(struct nvkm_pmu *); -- 2.13.0 _______________________________________________ Nouveau mailing list Nouveau@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/nouveau