diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:22 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:48 +1000 |
| commit | d4c4cc8373806d0f822f8847f8bcda64f36cb73f (patch) | |
| tree | 283b2cbc65a372d737ea0b2bc181e8d0a46cb2d1 /drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c | |
| parent | 0a34fb3149c3001f9c1b2bd0f98f94d63e74cb85 (diff) | |
| download | op-kernel-dev-d4c4cc8373806d0f822f8847f8bcda64f36cb73f.zip op-kernel-dev-d4c4cc8373806d0f822f8847f8bcda64f36cb73f.tar.gz | |
drm/nouveau/mc: abstract interface to master intr registers
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c index 09dc2eb..d282ec1 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c @@ -39,6 +39,27 @@ nv04_mc_intr[] = { }; void +nv04_mc_intr_unarm(struct nvkm_mc *mc) +{ + struct nvkm_device *device = mc->subdev.device; + nvkm_wr32(device, 0x000140, 0x00000000); + nvkm_rd32(device, 0x000140); +} + +void +nv04_mc_intr_rearm(struct nvkm_mc *mc) +{ + struct nvkm_device *device = mc->subdev.device; + nvkm_wr32(device, 0x000140, 0x00000001); +} + +u32 +nv04_mc_intr_mask(struct nvkm_mc *mc) +{ + return nvkm_rd32(mc->subdev.device, 0x000100); +} + +void nv04_mc_init(struct nvkm_mc *mc) { struct nvkm_device *device = mc->subdev.device; @@ -50,6 +71,9 @@ static const struct nvkm_mc_func nv04_mc = { .init = nv04_mc_init, .intr = nv04_mc_intr, + .intr_unarm = nv04_mc_intr_unarm, + .intr_rearm = nv04_mc_intr_rearm, + .intr_mask = nv04_mc_intr_mask, }; int |
