fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 11:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

iris: make iris_batch target a particular ring

Browse source
This commit is contained in:
Kenneth Graunke 2018-01-20 23:11:37 -08:00
parent 64f043570d
commit b701096ab9
3 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gallium/drivers/iris/iris_batch.c
View file

@ -108,13 +108,17 @@ create_batch_buffer(struct iris_bufmgr *bufmgr,
}
void
iris_batch_init(struct iris_batch *batch,
iris_init_batch(struct iris_batch *batch,
struct iris_screen *screen,
struct pipe_debug_callback *dbg)
struct pipe_debug_callback *dbg,
uint8_t ring)
{
batch->screen = screen;
batch->dbg = dbg;
assert((ring & ~I915_EXEC_RING_MASK) == 0);
batch->ring = ring;
init_reloc_list(&batch->cmdbuf.relocs, 256);
init_reloc_list(&batch->statebuf.relocs, 256);
@ -504,10 +508,10 @@ submit_batch(struct iris_batch *batch, int in_fence_fd, int *out_fence_fd)
.buffer_count = batch->exec_count,
.batch_start_offset = 0,
.batch_len = buffer_bytes_used(&batch->cmdbuf),
.flags = I915_EXEC_NO_RELOC |
.flags = batch->ring |
I915_EXEC_NO_RELOC |
I915_EXEC_BATCH_FIRST |
I915_EXEC_HANDLE_LUT |
I915_EXEC_RENDER,
I915_EXEC_HANDLE_LUT,
.rsvd1 = batch->hw_ctx_id, /* rsvd1 is actually the context ID */
};

8
src/gallium/drivers/iris/iris_batch.h
View file

@ -64,6 +64,9 @@ struct iris_batch {
uint32_t hw_ctx_id;
/** Which ring this batch targets - a I915_EXEC_RING_MASK value */
uint8_t ring;
bool no_wrap;
/** The validation list */
@ -79,9 +82,10 @@ struct iris_batch {
struct hash_table *state_sizes;
};
void iris_batch_init(struct iris_batch *batch,
void iris_init_batch(struct iris_batch *batch,
struct iris_screen *screen,
struct pipe_debug_callback *dbg);
struct pipe_debug_callback *dbg,
uint8_t ring);
void iris_batch_free(struct iris_batch *batch);
void iris_require_command_space(struct iris_batch *batch, unsigned size);
void iris_require_state_space(struct iris_batch *batch, unsigned size);

3
src/gallium/drivers/iris/iris_context.c
View file

@ -28,6 +28,7 @@
#include "util/u_inlines.h"
#include "util/u_format.h"
#include "util/u_upload_mgr.h"
#include "i915_drm.h"
#include "iris_context.h"
#include "iris_resource.h"
#include "iris_screen.h"
@ -111,7 +112,7 @@ iris_create_context(struct pipe_screen *pscreen, void *priv, unsigned flags)
iris_init_program_cache(ice);
iris_batch_init(&ice->render_batch, screen, &ice->dbg);
iris_init_batch(&ice->render_batch, screen, &ice->dbg, I915_EXEC_RENDER);
return ctx;
}