drm/nv50/gr: make sure NEXT_TO_CURRENT is executed even if nothing done

PFIFO channel kickoff will hang sometimes otherwise.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nv50_grctx.c b/drivers/gpu/drm/nouveau/nv50_grctx.c
index 7ac7e68109665bb8d0ca1d82ceb0cf39e8c244eb..881e22b249fc5e0e34750614fb241c0a77b600db 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_grctx.c
+++ b/drivers/gpu/drm/nouveau/nv50_grctx.c
@@ -210,7 +210,7 @@ nv50_grctx_generate(struct nouveau_grctx *ctx)
        cp_name(ctx, cp_check_load);
        cp_bra (ctx, AUTO_LOAD, PENDING, cp_setup_auto_load);
        cp_bra (ctx, USER_LOAD, PENDING, cp_setup_load);
-       cp_bra (ctx, ALWAYS, TRUE, cp_exit);
+       cp_bra (ctx, ALWAYS, TRUE, cp_prepare_exit);
 
        /* setup for context load */
        cp_name(ctx, cp_setup_auto_load);