From 4e1af6808c0db3f8ddf44b080f95207fc63ead0f Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 13 Sep 2018 12:56:18 -0700 Subject: [PATCH] v3d: Switch from FLUSH_ALL_STATE to FLUSH for ending our bin CLs. The HW for FLUSH_ALL_STATE isn't validated, since the closed driver only uses FLUSH. Now that we don't have any new state at the end of our bin CLs, follow their lead. --- src/gallium/drivers/v3d/v3dx_job.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/v3d/v3dx_job.c b/src/gallium/drivers/v3d/v3dx_job.c index 997c1b1..1dbd20b 100644 --- a/src/gallium/drivers/v3d/v3dx_job.c +++ b/src/gallium/drivers/v3d/v3dx_job.c @@ -36,7 +36,7 @@ void v3dX(bcl_epilogue)(struct v3d_context *v3d, struct v3d_job *job) #if V3D_VERSION >= 41 cl_packet_length(TRANSFORM_FEEDBACK_SPECS) + #endif - cl_packet_length(FLUSH_ALL_STATE)); + cl_packet_length(FLUSH)); /* Disable TF at the end of the CL, so that the TF block * cleans up and finishes before it gets reset by the next @@ -50,10 +50,10 @@ void v3dX(bcl_epilogue)(struct v3d_context *v3d, struct v3d_job *job) } #endif /* V3D_VERSION >= 41 */ - /* The FLUSH_ALL emits any unwritten state changes in each - * tile. We can use this to reset any state that needs to be - * present at the start of the next tile, as we do with - * OCCLUSION_QUERY_COUNTER above. + /* We just FLUSH here to tell the HW to cap the bin CLs with a + * return. Any remaining state changes won't be flushed to + * the bins first -- you would need FLUSH_ALL for that, but + * the HW for hasn't been validated */ - cl_emit(&job->bcl, FLUSH_ALL_STATE, flush); + cl_emit(&job->bcl, FLUSH, flush); } -- 2.7.4