diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-05-01 16:12:32 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-05-24 16:56:03 +1000 |
| commit | 71af5e62db5d7d6348e838d0f79533653e2f8cfe (patch) | |
| tree | c40087d04f7bb58acdb149322000f02065fb3d57 | |
| parent | 694931d20f41f9bf23f96ccae1b3a12a13ed54d9 (diff) | |
| download | talos-obmc-linux-71af5e62db5d7d6348e838d0f79533653e2f8cfe.tar.gz talos-obmc-linux-71af5e62db5d7d6348e838d0f79533653e2f8cfe.zip | |
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>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_grctx.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |
