diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-10-28 11:21:44 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-12-02 15:37:21 +1000 |
| commit | b47892b9a85bf22494934c72166730c3bae63136 (patch) | |
| tree | 0926eb9cdaac7ebb796bc8118a9c74c21a0e5262 /nvkm | |
| parent | 6129f2619e9f1a38d21cc5c6222110c0fb5ddad4 (diff) | |
| download | nouveau-b47892b9a85bf22494934c72166730c3bae63136.tar.gz | |
disp: clear notify intr status when enabling, to prevent races
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'nvkm')
| -rw-r--r-- | nvkm/engine/disp/nv50.c | 2 | ||||
| -rw-r--r-- | nvkm/engine/disp/nvd0.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/nvkm/engine/disp/nv50.c b/nvkm/engine/disp/nv50.c index 6e7deeaba..44a8290aa 100644 --- a/nvkm/engine/disp/nv50.c +++ b/nvkm/engine/disp/nv50.c @@ -88,12 +88,14 @@ nv50_disp_chan_uevent_fini(struct nvkm_event *event, int type, int index) { struct nv50_disp_priv *priv = container_of(event, typeof(*priv), uevent); nv_mask(priv, 0x610028, 0x00000001 << index, 0x00000000 << index); + nv_wr32(priv, 0x610020, 0x00000001 << index); } static void nv50_disp_chan_uevent_init(struct nvkm_event *event, int types, int index) { struct nv50_disp_priv *priv = container_of(event, typeof(*priv), uevent); + nv_wr32(priv, 0x610020, 0x00000001 << index); nv_mask(priv, 0x610028, 0x00000001 << index, 0x00000001 << index); } diff --git a/nvkm/engine/disp/nvd0.c b/nvkm/engine/disp/nvd0.c index f3120b70b..181a2d57e 100644 --- a/nvkm/engine/disp/nvd0.c +++ b/nvkm/engine/disp/nvd0.c @@ -51,12 +51,14 @@ nvd0_disp_chan_uevent_fini(struct nvkm_event *event, int type, int index) { struct nv50_disp_priv *priv = container_of(event, typeof(*priv), uevent); nv_mask(priv, 0x610090, 0x00000001 << index, 0x00000000 << index); + nv_wr32(priv, 0x61008c, 0x00000001 << index); } static void nvd0_disp_chan_uevent_init(struct nvkm_event *event, int types, int index) { struct nv50_disp_priv *priv = container_of(event, typeof(*priv), uevent); + nv_wr32(priv, 0x61008c, 0x00000001 << index); nv_mask(priv, 0x610090, 0x00000001 << index, 0x00000001 << index); } |