diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-06-06 11:34:27 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-06-23 15:59:07 +1000 |
| commit | b7cb6c01ee549b6c7c365c92f156983d346295a3 (patch) | |
| tree | ed188dfde5cedb05f6c478925f947f0bb2a97ac9 /drivers/gpu/drm/nouveau/nouveau_channel.c | |
| parent | 639212d01157266d9ee0b904fbc9f4a556e1c711 (diff) | |
| download | blackbird-op-linux-b7cb6c01ee549b6c7c365c92f156983d346295a3.tar.gz blackbird-op-linux-b7cb6c01ee549b6c7c365c92f156983d346295a3.zip | |
drm/nouveau: modify gpuobj/ntfy takedown ordering
gpuobj really needs splitting into channel/gpuobj code instead...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_channel.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_channel.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c index 764dd672112a..96ac906cfee5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_channel.c +++ b/drivers/gpu/drm/nouveau/nouveau_channel.c @@ -27,6 +27,7 @@ #include "nouveau_drv.h" #include "nouveau_drm.h" #include "nouveau_dma.h" +#include "nouveau_ramht.h" static int nouveau_channel_pushbuf_ctxdma_init(struct nouveau_channel *chan) @@ -316,8 +317,9 @@ nouveau_channel_put_unlocked(struct nouveau_channel **pchan) nouveau_bo_unpin(chan->pushbuf_bo); nouveau_bo_ref(NULL, &chan->pushbuf_bo); } - nouveau_gpuobj_channel_takedown(chan); + nouveau_ramht_ref(NULL, &chan->ramht, chan); nouveau_notifier_takedown_channel(chan); + nouveau_gpuobj_channel_takedown(chan); nouveau_channel_ref(NULL, pchan); } |
