r600g: add context control to start of CS

On my original R600 card this at least lets gnome shell run for a while longer
and the piglit r300-readcache test case works a lot more reliably.

Still a few more stability issues running a piglit test run though.

Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/gallium/winsys/r600/drm/r600_hw_context.c b/src/gallium/winsys/r600/drm/r600_hw_context.c
index a3f85d229196cb9fbcc7aa70cd5381da15220a0f..84b56e3f8b381c9587cb1e41d8087b0944f13854 100644 (file)
--- a/src/gallium/winsys/r600/drm/r600_hw_context.c
+++ b/src/gallium/winsys/r600/drm/r600_hw_context.c
@@ -40,6 +40,13 @@
 
 #define GROUP_FORCE_NEW_BLOCK  0
 
+static void r600_init_cs(struct r600_context *ctx)
+{
+       ctx->pm4[ctx->pm4_cdwords++] = PKT3(PKT3_CONTEXT_CONTROL, 1, 0);
+       ctx->pm4[ctx->pm4_cdwords++] = 0x80000000;
+       ctx->pm4[ctx->pm4_cdwords++] = 0x80000000;
+}
+
 static void INLINE r600_context_update_fenced_list(struct r600_context *ctx)
 {
        for (int i = 0; i < ctx->creloc; i++) {
@@ -780,6 +787,9 @@ int r600_context_init(struct r600_context *ctx, struct radeon *radeon)
                r = -ENOMEM;
                goto out_err;
        }
+
+       if (ctx->radeon->family == CHIP_R600)
+               r600_init_cs(ctx);
        /* save 16dwords space for fence mecanism */
        ctx->pm4_ndwords -= 16;
 
@@ -1385,6 +1395,9 @@ void r600_context_flush(struct r600_context *ctx)
        ctx->pm4_cdwords = 0;
        ctx->flags = 0;
 
+       if (ctx->radeon->family == CHIP_R600)
+               r600_init_cs(ctx);
+
        /* resume queries */
        r600_context_queries_resume(ctx);