r600: no need to reinit compute regs
authorDave Airlie <airlied@redhat.com>
Thu, 23 Nov 2017 00:19:14 +0000 (10:19 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 29 Nov 2017 23:53:22 +0000 (09:53 +1000)
Compute setup gets emitted into the normal gfx state buffer,
so no need to reinit the basics.

Signed-off-by: Dave Airlie <airlied@redhat.com>
src/gallium/drivers/r600/evergreen_compute.c

index 0573f8e..59063b1 100644 (file)
@@ -898,11 +898,6 @@ void evergreen_init_atom_start_compute_cs(struct r600_context *rctx)
        r600_init_command_buffer(cb, 256);
        cb->pkt_flags = RADEON_CP_PACKET3_COMPUTE_MODE;
 
-       /* This must be first. */
-       r600_store_value(cb, PKT3(PKT3_CONTEXT_CONTROL, 1, 0));
-       r600_store_value(cb, 0x80000000);
-       r600_store_value(cb, 0x80000000);
-
        /* We're setting config registers here. */
        r600_store_value(cb, PKT3(PKT3_EVENT_WRITE, 0, 0));
        r600_store_value(cb, EVENT_TYPE(EVENT_TYPE_CS_PARTIAL_FLUSH) | EVENT_INDEX(4));
@@ -952,14 +947,6 @@ void evergreen_init_atom_start_compute_cs(struct r600_context *rctx)
                break;
        }
 
-       /* Config Registers */
-       if (rctx->b.chip_class < CAYMAN)
-               evergreen_init_common_regs(rctx, cb, rctx->b.chip_class, rctx->b.family,
-                                          rctx->screen->b.info.drm_minor);
-       else
-               cayman_init_common_regs(cb, rctx->b.chip_class, rctx->b.family,
-                                       rctx->screen->b.info.drm_minor);
-
        /* The primitive type always needs to be POINTLIST for compute. */
        r600_store_config_reg(cb, R_008958_VGT_PRIMITIVE_TYPE,
                                                V_008958_DI_PT_POINTLIST);