Commit 2a6789ae authored by Francisco Jerez's avatar Francisco Jerez Committed by Ben Skeggs
Browse files

drm/nouveau: Make fences take a weak channel reference. 



Fences didn't increment the channel reference count, and the fenced
channel could go away at any time. Fixes a potential race in
nouveau_fence_update().

Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent f091a3d4

drivers/gpu/drm/nouveau/nouveau_fence.c

+2 −1
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ nouveau_fence_del(struct kref *ref) 
	struct nouveau_fence *fence =

		container_of(ref, struct nouveau_fence, refcount);



	nouveau_channel_ref(NULL, &fence->channel);

	kfree(fence);

}
@@ -113,7 +114,7 @@ nouveau_fence_new(struct nouveau_channel *chan, struct nouveau_fence **pfence, 
	if (!fence)

		return -ENOMEM;

	kref_init(&fence->refcount);

	fence->channel = chan;

	nouveau_channel_ref(chan, &fence->channel);



	if (emit)

		ret = nouveau_fence_emit(fence);