From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 1 May 2012 06:12:32 +0000 (+1000)
Subject: drm/nv50/gr: make sure NEXT_TO_CURRENT is executed even if nothing done
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=71af5e62db5d7d6348e838d0f79533653e2f8cfe;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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 7ac7e6810966..881e22b249fc 100644
--- 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);