From 5969f9b79c0f52a61703bc6e829061169241bc1d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 1 Aug 2014 17:17:03 -0700 Subject: [PATCH] vc4: Rename GEM_HANDLES to be in a namespace. It's not a real VC4 hardware packet, but I've put in a comment to explain it. --- src/gallium/drivers/vc4/vc4_cl.h | 2 +- src/gallium/drivers/vc4/vc4_packet.h | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/vc4/vc4_cl.h b/src/gallium/drivers/vc4/vc4_cl.h index 3e7c4836569..4e699df9391 100644 --- a/src/gallium/drivers/vc4/vc4_cl.h +++ b/src/gallium/drivers/vc4/vc4_cl.h @@ -98,7 +98,7 @@ cl_start_reloc(struct vc4_cl *cl, uint32_t n) assert(cl->reloc_count == 0); cl->reloc_count = n; - cl_u8(cl, GEM_HANDLES); + cl_u8(cl, VC4_PACKET_GEM_HANDLES); cl->reloc_next = cl->next - cl->base; cl_u32(cl, 0); /* Space where hindex will be written. */ cl_u32(cl, 0); /* Space where hindex will be written. */ diff --git a/src/gallium/drivers/vc4/vc4_packet.h b/src/gallium/drivers/vc4/vc4_packet.h index cc378667778..35ce7300f3f 100644 --- a/src/gallium/drivers/vc4/vc4_packet.h +++ b/src/gallium/drivers/vc4/vc4_packet.h @@ -72,7 +72,13 @@ enum vc4_packet { VC4_PACKET_TILE_RENDERING_MODE_CONFIG = 113, VC4_PACKET_CLEAR_COLORS = 114, VC4_PACKET_TILE_COORDINATES = 115, - GEM_HANDLES = 254, + + /* Not an actual hardware packet -- this is what we use to put + * references to GEM bos in the command stream, since we need the u32 + * int the actual address packet in order to store the offset from the + * start of the BO. + */ + VC4_PACKET_GEM_HANDLES = 254, } __attribute__ ((__packed__)); /** @{ -- 2.30.2