Commit 7ba01b50 authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

drm/nouveau: remove double WFI when destroying channels 



This is particularly irritating when the channel has hung.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 40184ece

drivers/gpu/drm/nouveau/nouveau_abi16.c

+2 −4
Original line number Diff line number Diff line
@@ -126,9 +126,8 @@ 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)

	/* wait for all activity to stop before cleaning up */

	if (chan->chan)

		nouveau_channel_idle(chan->chan);



	/* cleanup notifier state */
@@ -148,7 +147,6 @@ nouveau_abi16_chan_fini(struct nouveau_abi16 *abi16, 
	/* destroy channel object, all children will be killed too */

	if (chan->chan) {

		nvif_object_dtor(&chan->ce);

		nouveau_channel_idle(chan->chan);

		nouveau_channel_del(&chan->chan);

	}