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:47 +1000 |
| commit | fbd58ebda9c8572ca6285b88e3348c7712f125ec (patch) | |
| tree | 1c72cee029d928003eadb62cbee945dee2c5298e /drivers/gpu/drm/nouveau/nouveau_abi16.c | |
| parent | 68f3f702b6a430a8d1e909455a60d26c0f2da530 (diff) | |
| download | linux-stable-fbd58ebda9c8572ca6285b88e3348c7712f125ec.tar.gz linux-stable-fbd58ebda9c8572ca6285b88e3348c7712f125ec.tar.bz2 linux-stable-fbd58ebda9c8572ca6285b88e3348c7712f125ec.zip | |
drm/nouveau/object: merge with handle
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_abi16.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_abi16.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c index 6634f420ded3..40a903b79343 100644 --- a/drivers/gpu/drm/nouveau/nouveau_abi16.c +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c @@ -134,6 +134,7 @@ nouveau_abi16_chan_fini(struct nouveau_abi16 *abi16, /* destroy channel object, all children will be killed too */ if (chan->chan) { abi16->handles &= ~(1ULL << (chan->chan->user.handle & 0xffff)); + nouveau_channel_idle(chan->chan); nouveau_channel_del(&chan->chan); } |