fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 18:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ilo: unblock an inline write with a staging bo

Browse source 
This should allow a deeper pipeline.
This commit is contained in:
Chia-I Wu 2014-07-28 15:11:42 +08:00
parent 7395432f2e
commit 717e3b1ca1
1 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/gallium/drivers/ilo/ilo_transfer.c
View file

@ -1121,27 +1121,45 @@ buf_pwrite(struct ilo_context *ilo, struct ilo_buffer *buf,
{
bool need_flush;
/* see if we can avoid stalling */
/* see if we can avoid blocking */
if (is_bo_busy(ilo, buf->bo, &need_flush)) {
bool will_stall = true;
bool unblocked = false;
if (usage & PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE) {
/* old data not needed so discard the old bo to avoid stalling */
if (ilo_buffer_rename_bo(buf)) {
ilo_mark_states_with_resource_dirty(ilo, &buf->base);
will_stall = false;
}
if ((usage & PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE) &&
ilo_buffer_rename_bo(buf)) {
ilo_mark_states_with_resource_dirty(ilo, &buf->base);
unblocked = true;
}
else {
struct pipe_resource templ, *staging;
/*
* We could allocate a temporary bo to hold the data and emit
* pipelined copy blit to move them to buf->bo. But for now, do
* nothing.
* allocate a staging buffer to hold the data and pipelined copy it
* over
*/
templ = buf->base;
templ.width0 = size;
templ.usage = PIPE_USAGE_STAGING;
templ.bind = PIPE_BIND_TRANSFER_WRITE;
staging = ilo->base.screen->resource_create(ilo->base.screen, &templ);
if (staging) {
struct pipe_box staging_box;
intel_bo_pwrite(ilo_buffer(staging)->bo, 0, size, data);
u_box_1d(0, size, &staging_box);
ilo_blitter_blt_copy_resource(ilo->blitter,
&buf->base, 0, offset, 0, 0,
staging, 0, &staging_box);
pipe_resource_reference(&staging, NULL);
return;
}
}
/* flush to make bo busy (so that pwrite() stalls as it should be) */
if (will_stall && need_flush)
/* flush to make bo really busy so that pwrite() correctly blocks */
if (!unblocked && need_flush)
ilo_cp_flush(ilo->cp, "syncing for pwrites");
}