diff options
| author | Tomeu Vizoso <[email protected]> | 2019-11-07 08:27:53 +0100 |
|---|---|---|
| committer | Tomeu Vizoso <[email protected]> | 2019-11-07 08:48:45 +0000 |
| commit | 072207bc18430856c0e7a32b2cbc181f4a89276e (patch) | |
| tree | 1c4854a9492095f25995aff211be5ae3d115c13c /src/gallium/drivers | |
| parent | a47e232ccd1df7a3f5dd1f92722772e8b81c90ed (diff) | |
panfrost: Pipe the GPU ID into compiler and disassembler
Signed-off-by: Tomeu Vizoso <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/panfrost/pan_assemble.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/panfrost/pan_blend_shaders.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/panfrost/pan_job.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/drivers/panfrost/pan_assemble.c b/src/gallium/drivers/panfrost/pan_assemble.c index 2d1d1d172aa..5a36465500e 100644 --- a/src/gallium/drivers/panfrost/pan_assemble.c +++ b/src/gallium/drivers/panfrost/pan_assemble.c @@ -65,7 +65,7 @@ panfrost_shader_compile( .alpha_ref = state->alpha_state.ref_value }; - midgard_compile_shader_nir(&ctx->compiler, s, &program, false); + midgard_compile_shader_nir(&ctx->compiler, s, &program, false, screen->gpu_id); /* Prepare the compiled binary for upload */ int size = program.compiled.size; diff --git a/src/gallium/drivers/panfrost/pan_blend_shaders.c b/src/gallium/drivers/panfrost/pan_blend_shaders.c index 2ee86b4e7db..223925c2ebb 100644 --- a/src/gallium/drivers/panfrost/pan_blend_shaders.c +++ b/src/gallium/drivers/panfrost/pan_blend_shaders.c @@ -131,6 +131,7 @@ panfrost_compile_blend_shader( struct pipe_blend_state *cso, enum pipe_format format) { + struct panfrost_screen *screen = pan_screen(ctx->base.screen); struct panfrost_blend_shader res; res.ctx = ctx; @@ -172,7 +173,7 @@ panfrost_compile_blend_shader( /* Compile the built shader */ midgard_program program; - midgard_compile_shader_nir(&ctx->compiler, shader, &program, true); + midgard_compile_shader_nir(&ctx->compiler, shader, &program, true, screen->gpu_id); /* At least two work registers are needed due to an encoding quirk */ res.work_count = MAX2(program.work_register_count, 2); diff --git a/src/gallium/drivers/panfrost/pan_job.c b/src/gallium/drivers/panfrost/pan_job.c index 8df3480697d..a0bc999f1ae 100644 --- a/src/gallium/drivers/panfrost/pan_job.c +++ b/src/gallium/drivers/panfrost/pan_job.c @@ -881,7 +881,7 @@ panfrost_batch_submit_ioctl(struct panfrost_batch *batch, /* Wait so we can get errors reported back */ drmSyncobjWait(screen->fd, &batch->out_sync->syncobj, 1, INT64_MAX, 0, NULL); - pandecode_jc(submit.jc, FALSE); + pandecode_jc(submit.jc, FALSE, screen->gpu_id); } return 0; |