iris: Initialize batch screen in iris_init_batch()

The comment to initialize screen earlier not valid anymore so we can
initialize it with the rest of batch fields.

Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22172>

diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c
index d85acb65e42e16c1056cf509d231a86f834547bb..7f009f7c3cde97bcddc7d2a49668b94657d02f88 100644 (file)
--- a/src/gallium/drivers/iris/iris_batch.c
+++ b/src/gallium/drivers/iris/iris_batch.c
@@ -197,6 +197,7 @@ iris_init_batch(struct iris_context *ice,
    batch->state_sizes = ice->state.sizes;
    batch->name = name;
    batch->ice = ice;
+   batch->screen = screen;
    batch->contains_fence_signal = false;
 
    batch->fine_fences.uploader =
@@ -255,10 +256,6 @@ iris_init_batch(struct iris_context *ice,
 void
 iris_init_batches(struct iris_context *ice)
 {
-   /* We have to do this early for iris_foreach_batch() to work */
-   for (int i = 0; i < IRIS_BATCH_COUNT; i++)
-      ice->batches[i].screen = (void *) ice->ctx.screen;
-
    iris_i915_init_batches(ice);
 
    iris_foreach_batch(ice, batch)