fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

iris: Defines for base addresses rather than numbers everywhere

Browse source
This commit is contained in:
Kenneth Graunke 2018-04-20 18:44:22 -07:00
parent c75a1254a4
commit 841b3b9003
4 changed files with 56 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/iris/iris_binder.h
View file

@ -30,8 +30,6 @@
struct iris_bo;
struct iris_bufmgr;
#define IRIS_BINDER_ADDRESS (1ull << 32)
struct iris_binder
{
struct iris_bo *bo;

23
src/gallium/drivers/iris/iris_bufmgr.c
View file

@ -229,19 +229,22 @@ bucket_for_size(struct iris_bufmgr *bufmgr, uint64_t size)
static enum iris_memory_zone
memzone_for_address(uint64_t address)
{
const uint64_t _4GB = 1ull << 32;
STATIC_ASSERT(IRIS_MEMZONE_OTHER_START > IRIS_MEMZONE_DYNAMIC_START);
STATIC_ASSERT(IRIS_MEMZONE_DYNAMIC_START > IRIS_MEMZONE_SURFACE_START);
STATIC_ASSERT(IRIS_MEMZONE_SURFACE_START > IRIS_MEMZONE_SHADER_START);
STATIC_ASSERT(IRIS_BINDER_ADDRESS == IRIS_MEMZONE_SURFACE_START);
if (address >= 3 * _4GB)
if (address >= IRIS_MEMZONE_OTHER_START)
return IRIS_MEMZONE_OTHER;
if (address >= 2 * _4GB)
if (address >= IRIS_MEMZONE_DYNAMIC_START)
return IRIS_MEMZONE_DYNAMIC;
if (address > 1 * _4GB)
/* Use > to exclude the binder */
if (address > IRIS_MEMZONE_SURFACE_START)
return IRIS_MEMZONE_SURFACE;
/* The binder isn't in any memory zone. */
if (address == 1 * _4GB)
if (address == IRIS_BINDER_ADDRESS)
return IRIS_MEMZONE_BINDER;
return IRIS_MEMZONE_SHADER;
@ -1537,16 +1540,18 @@ iris_bufmgr_init(struct gen_device_info *devinfo, int fd)
bufmgr->has_llc = devinfo->has_llc;
STATIC_ASSERT(IRIS_MEMZONE_SHADER_START == 0ull);
const uint64_t _4GB = 1ull << 32;
util_vma_heap_init(&bufmgr->vma_allocator[IRIS_MEMZONE_SHADER],
PAGE_SIZE, _4GB);
util_vma_heap_init(&bufmgr->vma_allocator[IRIS_MEMZONE_SURFACE],
1 * _4GB, _4GB);
IRIS_MEMZONE_SURFACE_START, _4GB);
util_vma_heap_init(&bufmgr->vma_allocator[IRIS_MEMZONE_DYNAMIC],
2 * _4GB, _4GB);
IRIS_MEMZONE_DYNAMIC_START, _4GB);
util_vma_heap_init(&bufmgr->vma_allocator[IRIS_MEMZONE_OTHER],
3 * _4GB, (1ull << 48) - 3 * _4GB);
IRIS_MEMZONE_OTHER_START,
(1ull << 48) - IRIS_MEMZONE_OTHER_START);
// XXX: driconf
bufmgr->bo_reuse = env_var_as_boolean("bo_reuse", true);

41
src/gallium/drivers/iris/iris_bufmgr.h
View file

@ -36,10 +36,40 @@
struct gen_device_info;
struct pipe_debug_callback;
/**
* Memory zones. When allocating a buffer, you can request that it is
* placed into a specific region of the virtual address space (PPGTT).
*
* Most buffers can go anywhere (IRIS_MEMZONE_OTHER). Some buffers are
* accessed via an offset from a base address. STATE_BASE_ADDRESS has
* a maximum 4GB size for each region, so we need to restrict those
* buffers to be within 4GB of the base. Each memory zone corresponds
* to a particular base address.
*
* We lay out the virtual address space as follows:
*
* - [0, 4K): Nothing (empty page for null address)
* - [4K, 4G): Shaders (Instruction Base Address)
* - [4G, 8G): Surfaces (Surface State Base Address, Bindless ...)
* - [8G, 12G): Dynamic (Dynamic State Base Address)
* - [12G, *): Other (everything else in the full 48-bit VMA)
*
* A special 64kB "binder" buffer lives at the start of the surface memory
* zone, holding binding tables referring to objects in the rest of the zone.
*
* Each GL context uses a separate GEM context, which technically gives them
* each a separate VMA. However, we assign address globally, so buffers will
* have the same address in all GEM contexts. This lets us have a single BO
* field for the address, which is easy and cheap.
*
* One exception is the special "binder" BO. Binders are context-local,
* so while there are many of them, all binders are stored at the same
* fixed address (in different VMAs).
*/
enum iris_memory_zone {
IRIS_MEMZONE_DYNAMIC,
IRIS_MEMZONE_SURFACE,
IRIS_MEMZONE_SHADER,
IRIS_MEMZONE_SURFACE,
IRIS_MEMZONE_DYNAMIC,
IRIS_MEMZONE_OTHER,
IRIS_MEMZONE_BINDER,
@ -48,6 +78,13 @@ enum iris_memory_zone {
/* Intentionally exclude IRIS_MEMZONE_BINDER */
#define IRIS_MEMZONE_COUNT (IRIS_MEMZONE_OTHER + 1)
#define IRIS_MEMZONE_SHADER_START (0 * (1ull << 32))
#define IRIS_MEMZONE_SURFACE_START (1 * (1ull << 32))
#define IRIS_MEMZONE_DYNAMIC_START (2 * (1ull << 32))
#define IRIS_MEMZONE_OTHER_START (3 * (1ull << 32))
#define IRIS_BINDER_ADDRESS IRIS_MEMZONE_SURFACE_START
struct iris_bo {
/**
* Size in bytes of the buffer object.

5
src/gallium/drivers/iris/iris_state.c
View file

@ -361,8 +361,9 @@ iris_init_render_context(struct iris_screen *screen,
sba.IndirectObjectBufferSizeModifyEnable = true;
sba.InstructionBuffersizeModifyEnable = true;
sba.SurfaceStateBaseAddress = ro_bo(NULL, 1ull << 32);
sba.DynamicStateBaseAddress = ro_bo(NULL, 2 * (1ull << 32));
sba.InstructionBaseAddress = ro_bo(NULL, IRIS_MEMZONE_SHADER_START);
sba.SurfaceStateBaseAddress = ro_bo(NULL, IRIS_MEMZONE_SURFACE_START);
sba.DynamicStateBaseAddress = ro_bo(NULL, IRIS_MEMZONE_DYNAMIC_START);
sba.GeneralStateBufferSize = 0xfffff;
sba.IndirectObjectBufferSize = 0xfffff;