diff options
| author | Eric Anholt <eric@anholt.net> | 2015-02-23 06:48:34 +0000 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2015-02-24 13:49:12 +0000 |
| commit | 49d3c6a8e63ead43fafb7d52e2c770a1320eb2ee (patch) | |
| tree | 1a9455ef787340a7b82883863f8b68b79871b718 /src/gallium/drivers/vc4/vc4_simulator.c | |
| parent | 1d1e820a6dce5e6fc8f67bd0f00e402645774e1b (diff) | |
vc4: Update to current kernel sources.
New BO create and mmap ioctls are added. The submit ABI gains a flags
argument, and the pointers are fixed at 64-bit. Shaders are now fixed at
the start of their BOs.
Diffstat (limited to 'src/gallium/drivers/vc4/vc4_simulator.c')
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_simulator.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/vc4/vc4_simulator.c b/src/gallium/drivers/vc4/vc4_simulator.c index ee4ad96123b..cd8cc5bb56c 100644 --- a/src/gallium/drivers/vc4/vc4_simulator.c +++ b/src/gallium/drivers/vc4/vc4_simulator.c @@ -65,7 +65,7 @@ drm_gem_cma_create(struct drm_device *dev, size_t size) } static int -vc4_simulator_pin_bos(struct drm_device *dev, struct exec_info *exec) +vc4_simulator_pin_bos(struct drm_device *dev, struct vc4_exec_info *exec) { struct drm_vc4_submit_cl *args = exec->args; struct vc4_context *vc4 = dev->vc4; @@ -90,7 +90,7 @@ vc4_simulator_pin_bos(struct drm_device *dev, struct exec_info *exec) } static int -vc4_simulator_unpin_bos(struct exec_info *exec) +vc4_simulator_unpin_bos(struct vc4_exec_info *exec) { for (int i = 0; i < exec->bo_count; i++) { struct drm_gem_cma_object *obj = exec->bo[i].bo; @@ -115,7 +115,7 @@ vc4_simulator_flush(struct vc4_context *vc4, struct drm_vc4_submit_cl *args) uint32_t winsys_stride = ctex ? ctex->bo->simulator_winsys_stride : 0; uint32_t sim_stride = ctex ? ctex->slices[0].stride : 0; uint32_t row_len = MIN2(sim_stride, winsys_stride); - struct exec_info exec; + struct vc4_exec_info exec; struct drm_device local_dev = { .vc4 = vc4, .simulator_mem_next = OVERFLOW_SIZE, |