fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-08 23:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

broadcom/vc5: Move the BCL epilogue code to a per-version compile.

Browse source 
I need to do some new packets for transform feedback on 4.1.
This commit is contained in:
Eric Anholt 2018-03-23 15:19:05 -07:00
parent 3387864130
commit 1fa820cef8
5 changed files with 67 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/drivers/vc5/Makefile.sources
View file

@ -28,6 +28,7 @@ C_SOURCES := \
VC5_PER_VERSION_SOURCES = \
v3dx_context.h \
v3dx_format_table.c \
v3dx_job.c \
v3dx_simulator.c \
vc5_draw.c \
vc5_emit.c \

1
src/gallium/drivers/vc5/meson.build
View file

@ -44,6 +44,7 @@ files_libvc5 = files(
files_per_version = files(
'v3dx_format_table.c',
'v3dx_job.c',
'v3dx_simulator.c',
'vc5_draw.c',
'vc5_emit.c',

2
src/gallium/drivers/vc5/v3dx_context.h
View file

@ -34,6 +34,8 @@ void v3dX(emit_rcl)(struct vc5_job *job);
void v3dX(draw_init)(struct pipe_context *pctx);
void v3dX(state_init)(struct pipe_context *pctx);
void v3dX(bcl_epilogue)(struct vc5_context *vc5, struct vc5_job *job);
void v3dX(simulator_init_regs)(struct v3d_hw *v3d);
int v3dX(simulator_get_param_ioctl)(struct v3d_hw *v3d,
struct drm_vc5_get_param *args);

59
src/gallium/drivers/vc5/v3dx_job.c Normal file
View file

@ -0,0 +1,59 @@
/*
* Copyright © 2014-2017 Broadcom
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
/** @file v3dx_job.c
*
* V3D version-specific functions for submitting VC5 render jobs to the
* kernel.
*/
#include "vc5_context.h"
#include "broadcom/cle/v3dx_pack.h"
void v3dX(bcl_epilogue)(struct vc5_context *vc5, struct vc5_job *job)
{
vc5_cl_ensure_space_with_branch(&job->bcl,
7 +
cl_packet_length(OCCLUSION_QUERY_COUNTER));
if (job->oq_enabled) {
/* Disable the OQ at the end of the CL, so that the
* draw calls at the start of the CL don't inherit the
* OQ counter.
*/
cl_emit(&job->bcl, OCCLUSION_QUERY_COUNTER, counter);
}
/* Increment the semaphore indicating that binning is done and
* unblocking the render thread. Note that this doesn't act
* until the FLUSH completes.
*/
cl_emit(&job->bcl, INCREMENT_SEMAPHORE, incr);
/* 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.
*/
cl_emit(&job->bcl, FLUSH_ALL_STATE, flush);
}

28
src/gallium/drivers/vc5/vc5_job.c
View file

@ -383,30 +383,10 @@ vc5_job_submit(struct vc5_context *vc5, struct vc5_job *job)
v3d33_emit_rcl(job);
if (cl_offset(&job->bcl) > 0) {
vc5_cl_ensure_space_with_branch(&job->bcl,
7 +
cl_packet_length(OCCLUSION_QUERY_COUNTER));
if (job->oq_enabled) {
/* Disable the OQ at the end of the CL, so that the
* draw calls at the start of the CL don't inherit the
* OQ counter.
*/
cl_emit(&job->bcl, OCCLUSION_QUERY_COUNTER, counter);
}
/* Increment the semaphore indicating that binning is done and
* unblocking the render thread. Note that this doesn't act
* until the FLUSH completes.
*/
cl_emit(&job->bcl, INCREMENT_SEMAPHORE, incr);
/* 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.
*/
cl_emit(&job->bcl, FLUSH_ALL_STATE, flush);
if (screen->devinfo.ver >= 41)
v3d41_bcl_epilogue(vc5, job);
else
v3d33_bcl_epilogue(vc5, job);
}
job->submit.bcl_end = job->bcl.bo->offset + cl_offset(&job->bcl);