vc4: Flush the job early if we're referencing too many BOs.
If we get up toward 256MB (or whatever the CMA area size is), VC4_GEM_CREATE will start throwing errors. Even if we don't trigger that, when we flush the kernel's BO allocation for the CLs or bin memory may end up throwing an error, at which point our job won't get rendered at all. Just flush early (half of maximum CMA size) so that hopefully we never get to that point.
This commit is contained in:
@@ -76,5 +76,7 @@ vc4_gem_hindex(struct vc4_job *job, struct vc4_bo *bo)
|
||||
cl_ptr(&out, vc4_bo_reference(bo));
|
||||
cl_end(&job->bo_pointers, out);
|
||||
|
||||
job->bo_space += bo->size;
|
||||
|
||||
return hindex;
|
||||
}
|
||||
|
||||
@@ -228,6 +228,13 @@ struct vc4_job {
|
||||
struct vc4_cl bo_handles;
|
||||
struct vc4_cl bo_pointers;
|
||||
uint32_t shader_rec_count;
|
||||
/**
|
||||
* Amount of memory used by the BOs in bo_pointers.
|
||||
*
|
||||
* Used for checking when we should flush the job early so we don't
|
||||
* OOM.
|
||||
*/
|
||||
uint32_t bo_space;
|
||||
|
||||
/** @{ Surfaces to submit rendering for. */
|
||||
struct pipe_surface *color_read;
|
||||
|
||||
@@ -466,6 +466,13 @@ vc4_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info)
|
||||
|
||||
job->resolve |= PIPE_CLEAR_COLOR0;
|
||||
|
||||
/* If we've used half of the presumably 256MB CMA area, flush the job
|
||||
* so that we don't accumulate a job that will end up not being
|
||||
* executable.
|
||||
*/
|
||||
if (job->bo_space > 128 * 1024 * 1024)
|
||||
vc4_flush(pctx);
|
||||
|
||||
if (vc4_debug & VC4_DEBUG_ALWAYS_FLUSH)
|
||||
vc4_flush(pctx);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user