From 9c2a519b79edd6ceb315631587ce71cde6ec914a Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 30 May 2016 08:50:50 +1000 Subject: mc/gf100-: support for masking interrupts Signed-off-by: Ben Skeggs --- drm/nouveau/nvkm/subdev/mc/gf100.c | 9 +++++++++ drm/nouveau/nvkm/subdev/mc/gk104.c | 1 + drm/nouveau/nvkm/subdev/mc/gk20a.c | 1 + drm/nouveau/nvkm/subdev/mc/priv.h | 1 + 4 files changed, 12 insertions(+) diff --git a/drm/nouveau/nvkm/subdev/mc/gf100.c b/drm/nouveau/nvkm/subdev/mc/gf100.c index b1126a5a8..d2c4d6033 100644 --- a/drm/nouveau/nvkm/subdev/mc/gf100.c +++ b/drm/nouveau/nvkm/subdev/mc/gf100.c @@ -84,6 +84,14 @@ gf100_mc_intr_stat(struct nvkm_mc *mc) return intr0 | intr1; } +void +gf100_mc_intr_mask(struct nvkm_mc *mc, u32 mask, u32 stat) +{ + struct nvkm_device *device = mc->subdev.device; + nvkm_mask(device, 0x000640, mask, stat); + nvkm_mask(device, 0x000644, mask, stat); +} + void gf100_mc_unk260(struct nvkm_mc *mc, u32 data) { @@ -96,6 +104,7 @@ gf100_mc = { .intr = gf100_mc_intr, .intr_unarm = gf100_mc_intr_unarm, .intr_rearm = gf100_mc_intr_rearm, + .intr_mask = gf100_mc_intr_mask, .intr_stat = gf100_mc_intr_stat, .reset = gf100_mc_reset, .unk260 = gf100_mc_unk260, diff --git a/drm/nouveau/nvkm/subdev/mc/gk104.c b/drm/nouveau/nvkm/subdev/mc/gk104.c index 99426814c..c6cc7a435 100644 --- a/drm/nouveau/nvkm/subdev/mc/gk104.c +++ b/drm/nouveau/nvkm/subdev/mc/gk104.c @@ -52,6 +52,7 @@ gk104_mc = { .intr = gk104_mc_intr, .intr_unarm = gf100_mc_intr_unarm, .intr_rearm = gf100_mc_intr_rearm, + .intr_mask = gf100_mc_intr_mask, .intr_stat = gf100_mc_intr_stat, .reset = gk104_mc_reset, .unk260 = gf100_mc_unk260, diff --git a/drm/nouveau/nvkm/subdev/mc/gk20a.c b/drm/nouveau/nvkm/subdev/mc/gk20a.c index 985f8cbab..ca1bf3279 100644 --- a/drm/nouveau/nvkm/subdev/mc/gk20a.c +++ b/drm/nouveau/nvkm/subdev/mc/gk20a.c @@ -29,6 +29,7 @@ gk20a_mc = { .intr = gk104_mc_intr, .intr_unarm = gf100_mc_intr_unarm, .intr_rearm = gf100_mc_intr_rearm, + .intr_mask = gf100_mc_intr_mask, .intr_stat = gf100_mc_intr_stat, .reset = gk104_mc_reset, }; diff --git a/drm/nouveau/nvkm/subdev/mc/priv.h b/drm/nouveau/nvkm/subdev/mc/priv.h index fb4ce6df5..4f0576a06 100644 --- a/drm/nouveau/nvkm/subdev/mc/priv.h +++ b/drm/nouveau/nvkm/subdev/mc/priv.h @@ -44,6 +44,7 @@ void nv50_mc_init(struct nvkm_mc *); void gf100_mc_intr_unarm(struct nvkm_mc *); void gf100_mc_intr_rearm(struct nvkm_mc *); +void gf100_mc_intr_mask(struct nvkm_mc *, u32, u32); u32 gf100_mc_intr_stat(struct nvkm_mc *); void gf100_mc_unk260(struct nvkm_mc *, u32); -- cgit v1.2.1