aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/nouveau/nv50_grctx.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_grctx.c b/drivers/gpu/drm/nouveau/nv50_grctx.c
index de9abff12b90..e04fb4483c5e 100644
--- a/drivers/gpu/drm/nouveau/nv50_grctx.c
+++ b/drivers/gpu/drm/nouveau/nv50_grctx.c
@@ -40,6 +40,9 @@
40#define CP_FLAG_UNK0B ((0 * 32) + 0xb) 40#define CP_FLAG_UNK0B ((0 * 32) + 0xb)
41#define CP_FLAG_UNK0B_CLEAR 0 41#define CP_FLAG_UNK0B_CLEAR 0
42#define CP_FLAG_UNK0B_SET 1 42#define CP_FLAG_UNK0B_SET 1
43#define CP_FLAG_STATE ((0 * 32) + 0x1c)
44#define CP_FLAG_STATE_STOPPED 0
45#define CP_FLAG_STATE_RUNNING 1
43#define CP_FLAG_UNK1D ((0 * 32) + 0x1d) 46#define CP_FLAG_UNK1D ((0 * 32) + 0x1d)
44#define CP_FLAG_UNK1D_CLEAR 0 47#define CP_FLAG_UNK1D_CLEAR 0
45#define CP_FLAG_UNK1D_SET 1 48#define CP_FLAG_UNK1D_SET 1
@@ -194,6 +197,8 @@ nv50_grctx_init(struct nouveau_grctx *ctx)
194 "the devs.\n"); 197 "the devs.\n");
195 return -ENOSYS; 198 return -ENOSYS;
196 } 199 }
200
201 cp_set (ctx, STATE, RUNNING);
197 /* decide whether we're loading/unloading the context */ 202 /* decide whether we're loading/unloading the context */
198 cp_bra (ctx, AUTO_SAVE, PENDING, cp_setup_save); 203 cp_bra (ctx, AUTO_SAVE, PENDING, cp_setup_save);
199 cp_bra (ctx, USER_SAVE, PENDING, cp_setup_save); 204 cp_bra (ctx, USER_SAVE, PENDING, cp_setup_save);
@@ -260,6 +265,7 @@ nv50_grctx_init(struct nouveau_grctx *ctx)
260 cp_name(ctx, cp_exit); 265 cp_name(ctx, cp_exit);
261 cp_set (ctx, USER_SAVE, NOT_PENDING); 266 cp_set (ctx, USER_SAVE, NOT_PENDING);
262 cp_set (ctx, USER_LOAD, NOT_PENDING); 267 cp_set (ctx, USER_LOAD, NOT_PENDING);
268 cp_set (ctx, STATE, STOPPED);
263 cp_out (ctx, CP_END); 269 cp_out (ctx, CP_END);
264 ctx->ctxvals_pos += 0x400; /* padding... no idea why you need it */ 270 ctx->ctxvals_pos += 0x400; /* padding... no idea why you need it */
265 271