From 6434f5c4942969dc60a8680c2ba00b97bf253009 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 14 Jun 2019 07:24:26 -0700 Subject: [PATCH] panfrost: Rename misc_0 -> tiler_polygon_list Just for readability. Signed-off-by: Alyssa Rosenzweig --- src/gallium/drivers/panfrost/pan_context.c | 14 +++++++------- src/gallium/drivers/panfrost/pan_context.h | 3 +-- src/gallium/drivers/panfrost/pan_drm.c | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c index 225561a51d1..fc6b8fbb0a1 100644 --- a/src/gallium/drivers/panfrost/pan_context.c +++ b/src/gallium/drivers/panfrost/pan_context.c @@ -119,8 +119,8 @@ panfrost_emit_sfbd(struct panfrost_context *ctx) .format = 0x30000000, .clear_flags = 0x1000, .unknown_address_0 = ctx->scratchpad.gpu, - .tiler_polygon_list = ctx->misc_0.gpu, - .tiler_polygon_list_body = ctx->misc_0.gpu + 40960, + .tiler_polygon_list = ctx->tiler_polygon_list.gpu, + .tiler_polygon_list_body = ctx->tiler_polygon_list.gpu + 40960, .tiler_hierarchy_mask = 0xF0, .tiler_flags = 0x0, .tiler_heap_free = ctx->tiler_heap.gpu, @@ -152,7 +152,7 @@ panfrost_emit_mfbd(struct panfrost_context *ctx) .tiler_heap_end = ctx->tiler_heap.gpu + ctx->tiler_heap.size, /* See pan_tiler.c */ - .tiler_polygon_list = ctx->misc_0.gpu, + .tiler_polygon_list = ctx->tiler_polygon_list.gpu, .width1 = MALI_POSITIVE(width), .height1 = MALI_POSITIVE(height), @@ -181,7 +181,7 @@ panfrost_emit_mfbd(struct panfrost_context *ctx) /* Sanity check */ unsigned total_size = header_size + body_size; - assert(ctx->misc_0.size >= total_size); + assert(ctx->tiler_polygon_list.size >= total_size); framebuffer.tiler_polygon_list_body = framebuffer.tiler_polygon_list + header_size; @@ -646,7 +646,7 @@ panfrost_set_value_job(struct panfrost_context *ctx) }; struct mali_payload_set_value payload = { - .out = ctx->misc_0.gpu, + .out = ctx->tiler_polygon_list.gpu, .unknown = 0x3, }; @@ -2389,7 +2389,7 @@ panfrost_destroy(struct pipe_context *pipe) screen->driver->free_slab(screen, &panfrost->varying_mem); screen->driver->free_slab(screen, &panfrost->shaders); screen->driver->free_slab(screen, &panfrost->tiler_heap); - screen->driver->free_slab(screen, &panfrost->misc_0); + screen->driver->free_slab(screen, &panfrost->tiler_polygon_list); } static struct pipe_query * @@ -2544,7 +2544,7 @@ panfrost_setup_hardware(struct panfrost_context *ctx) screen->driver->allocate_slab(screen, &ctx->varying_mem, 16384, false, PAN_ALLOCATE_INVISIBLE | PAN_ALLOCATE_COHERENT_LOCAL, 0, 0); screen->driver->allocate_slab(screen, &ctx->shaders, 4096, true, PAN_ALLOCATE_EXECUTE, 0, 0); screen->driver->allocate_slab(screen, &ctx->tiler_heap, 32768, false, PAN_ALLOCATE_INVISIBLE | PAN_ALLOCATE_GROWABLE, 1, 128); - screen->driver->allocate_slab(screen, &ctx->misc_0, 128*128, false, PAN_ALLOCATE_INVISIBLE | PAN_ALLOCATE_GROWABLE, 1, 128); + screen->driver->allocate_slab(screen, &ctx->tiler_polygon_list, 128*128, false, PAN_ALLOCATE_INVISIBLE | PAN_ALLOCATE_GROWABLE, 1, 128); } diff --git a/src/gallium/drivers/panfrost/pan_context.h b/src/gallium/drivers/panfrost/pan_context.h index 3eac8d6b5a2..58a913d9338 100644 --- a/src/gallium/drivers/panfrost/pan_context.h +++ b/src/gallium/drivers/panfrost/pan_context.h @@ -133,8 +133,7 @@ struct panfrost_context { struct panfrost_memory scratchpad; struct panfrost_memory tiler_heap; struct panfrost_memory varying_mem; - struct panfrost_memory misc_0; - struct panfrost_memory misc_1; + struct panfrost_memory tiler_polygon_list; struct panfrost_memory depth_stencil_buffer; struct panfrost_query *occlusion_query; diff --git a/src/gallium/drivers/panfrost/pan_drm.c b/src/gallium/drivers/panfrost/pan_drm.c index 3ceff41e25c..2b4097c5ce5 100644 --- a/src/gallium/drivers/panfrost/pan_drm.c +++ b/src/gallium/drivers/panfrost/pan_drm.c @@ -236,7 +236,7 @@ panfrost_drm_submit_job(struct panfrost_context *ctx, u64 job_desc, int reqs, st bo_handles[submit.bo_handle_count++] = ctx->scratchpad.gem_handle; bo_handles[submit.bo_handle_count++] = ctx->tiler_heap.gem_handle; bo_handles[submit.bo_handle_count++] = ctx->varying_mem.gem_handle; - bo_handles[submit.bo_handle_count++] = ctx->misc_0.gem_handle; + bo_handles[submit.bo_handle_count++] = ctx->tiler_polygon_list.gem_handle; submit.bo_handles = (u64) (uintptr_t) bo_handles; if (drmIoctl(drm->fd, DRM_IOCTL_PANFROST_SUBMIT, &submit)) { -- 2.30.2