diff options
| author | Ben Skeggs | 2017-10-31 18:56:20 +0100 |
|---|---|---|
| committer | Ben Skeggs | 2017-11-02 04:32:33 +0100 |
| commit | d7722134b8254bcee6086230723814cddf9ab54b (patch) | |
| tree | 7c814c6dd29b328f527e9a7af802e0736fa82ad9 /drivers/gpu/drm/nouveau/nouveau_chan.c | |
| parent | drm/nouveau: remove unused nouveau_fence_work() (diff) | |
| download | kernel-qcow2-linux-d7722134b8254bcee6086230723814cddf9ab54b.tar.gz kernel-qcow2-linux-d7722134b8254bcee6086230723814cddf9ab54b.tar.xz kernel-qcow2-linux-d7722134b8254bcee6086230723814cddf9ab54b.zip | |
drm/nouveau: switch over to new memory and vmm interfaces
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_chan.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_chan.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c index 34dbcf5f7f4e..af1116655910 100644 --- a/drivers/gpu/drm/nouveau/nouveau_chan.c +++ b/drivers/gpu/drm/nouveau/nouveau_chan.c @@ -84,6 +84,14 @@ nouveau_channel_del(struct nouveau_channel **pchan) { struct nouveau_channel *chan = *pchan; if (chan) { + struct nouveau_cli *cli = (void *)chan->user.client; + bool super; + + if (cli) { + super = cli->base.super; + cli->base.super = true; + } + if (chan->fence) nouveau_fence(chan->drm)->context_del(chan); nvif_object_fini(&chan->nvsw); @@ -98,6 +106,9 @@ nouveau_channel_del(struct nouveau_channel **pchan) nouveau_bo_unpin(chan->push.buffer); nouveau_bo_ref(NULL, &chan->push.buffer); kfree(chan); + + if (cli) + cli->base.super = super; } *pchan = NULL; } |