lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.4 070/100] drm/nouveau: Fix copy-paste error in nouveau_fence_wait_uevent_handler
    Date
    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 574c36b492ee4..fccec23731e24 100644
    --- a/drivers/gpu/drm/nouveau/nouveau_fence.c
    +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
    @@ -157,7 +157,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
    \
     
     \ /
      Last update: 2020-02-14 17:28    [W:4.028 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site