From bf90d8a1257f99dbb8b6143ca25dfc1badc34f36 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 6 Apr 2018 23:16:11 -0700 Subject: [PATCH] iris: delete more trash --- src/gallium/drivers/iris/iris_batch.c | 13 ------------- src/gallium/drivers/iris/iris_batch.h | 6 ------ 2 files changed, 19 deletions(-) diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c index 51c48476f86..d7c9dec7a83 100644 --- a/src/gallium/drivers/iris/iris_batch.c +++ b/src/gallium/drivers/iris/iris_batch.c @@ -495,7 +495,6 @@ submit_batch(struct iris_batch *batch, int in_fence_fd, int *out_fence_fd) execbuf.flags |= I915_EXEC_FENCE_OUT; } -#if 1 int ret = drm_ioctl(batch->screen->fd, cmd, &execbuf); if (ret != 0) { ret = -errno; @@ -503,24 +502,12 @@ submit_batch(struct iris_batch *batch, int in_fence_fd, int *out_fence_fd) } else { DBG("execbuf succeeded\n"); } -#else - int ret = 0; - fprintf(stderr, "execbuf disabled for now\n"); -#endif for (int i = 0; i < batch->exec_count; i++) { struct iris_bo *bo = batch->exec_bos[i]; bo->idle = false; bo->index = -1; - - /* Update iris_bo::gtt_offset */ - if (batch->validation_list[i].offset != bo->gtt_offset) { - DBG("BO %d migrated: 0x%" PRIx64 " -> 0x%llx\n", - bo->gem_handle, bo->gtt_offset, - batch->validation_list[i].offset); - bo->gtt_offset = batch->validation_list[i].offset; - } } if (ret == 0 && out_fence_fd != NULL) diff --git a/src/gallium/drivers/iris/iris_batch.h b/src/gallium/drivers/iris/iris_batch.h index 68a10741f32..8161b2d8b05 100644 --- a/src/gallium/drivers/iris/iris_batch.h +++ b/src/gallium/drivers/iris/iris_batch.h @@ -31,12 +31,6 @@ /* The kernel assumes batchbuffers are smaller than 256kB. */ #define MAX_BATCH_SIZE (256 * 1024) -/* 3DSTATE_BINDING_TABLE_POINTERS has a U16 offset from Surface State Base - * Address, which means that we can't put binding tables beyond 64kB. This - * effectively limits the maximum statebuffer size to 64kB. - */ -#define MAX_STATE_SIZE (64 * 1024) - struct iris_address { struct iris_bo *bo; uint64_t offset; -- 2.30.2