| From 2cf1101f72ea9e760e7efe5ee3110db2a9227b3f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 10 Jan 2020 14:32:01 +0800 |
| Subject: drm/nouveau: Fix copy-paste error in |
| nouveau_fence_wait_uevent_handler |
| |
| From: YueHaibing <yuehaibing@huawei.com> |
| |
| [ Upstream commit 1eb013473bff5f95b6fe1ca4dd7deda47257b9c2 ] |
| |
| Like other cases, it should use rcu protected 'chan' rather |
| than 'fence->channel' in nouveau_fence_wait_uevent_handler. |
| |
| Fixes: 0ec5f02f0e2c ("drm/nouveau: prevent stale fence->channel pointers, and protect with rcu") |
| Signed-off-by: YueHaibing <yuehaibing@huawei.com> |
| Signed-off-by: Ben Skeggs <bskeggs@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c |
| index 9118df035b28d..70bb6bb97af87 100644 |
| --- a/drivers/gpu/drm/nouveau/nouveau_fence.c |
| +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c |
| @@ -156,7 +156,7 @@ nouveau_fence_wait_uevent_handler(struct nvif_notify *notify) |
| |
| fence = list_entry(fctx->pending.next, typeof(*fence), head); |
| chan = rcu_dereference_protected(fence->channel, lockdep_is_held(&fctx->lock)); |
| - if (nouveau_fence_update(fence->channel, fctx)) |
| + if (nouveau_fence_update(chan, fctx)) |
| ret = NVIF_NOTIFY_DROP; |
| } |
| spin_unlock_irqrestore(&fctx->lock, flags); |
| -- |
| 2.20.1 |
| |
