From 20f19becae61429035675024efca7171b52ad629 Mon Sep 17 00:00:00 2001 From: Marcin Slusarz Date: Sun, 3 Mar 2013 18:58:45 +0100 Subject: [PATCH] --- yaml --- r: 361191 b: refs/heads/master c: 2b77c1c01b556045c451f034389932efb5b71c58 h: refs/heads/master i: 361189: 5ae06da8f1565c64a8a429aa0952a66916a3061c 361187: 6eb28a0ab2fba2bad345dafb0061ad670c268db6 361183: 9f26bc2abedace1ce70909de8a50865522835766 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_abi16.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 128be025bb7b..6de27f6895b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8f28f89566321842afb81d3ddd79d611e3587ce +refs/heads/master: 2b77c1c01b556045c451f034389932efb5b71c58 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_abi16.c b/trunk/drivers/gpu/drm/nouveau/nouveau_abi16.c index 41241922263f..3b6dc883e150 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_abi16.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_abi16.c @@ -116,6 +116,11 @@ nouveau_abi16_chan_fini(struct nouveau_abi16 *abi16, { struct nouveau_abi16_ntfy *ntfy, *temp; + /* wait for all activity to stop before releasing notify object, which + * may be still in use */ + if (chan->chan && chan->ntfy) + nouveau_channel_idle(chan->chan); + /* cleanup notifier state */ list_for_each_entry_safe(ntfy, temp, &chan->notifiers, head) { nouveau_abi16_ntfy_fini(chan, ntfy);