From c4a9a708884c2f790e04aaaa4a4cb2993ff33089 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 4 Oct 2007 15:31:47 +1000 Subject: i915: add superioctl support to the ttm codepaths. gears now runs for about 10-15 seconds with some artifacts before falling over. --- src/mesa/drivers/dri/common/dri_bufmgr.c | 4 +- src/mesa/drivers/dri/common/dri_bufmgr.h | 4 +- src/mesa/drivers/dri/common/dri_bufmgr_fake.c | 2 +- src/mesa/drivers/dri/i915/intel_batchbuffer.c | 5 +- src/mesa/drivers/dri/i915/intel_batchbuffer.h | 3 +- src/mesa/drivers/dri/i915/intel_bufmgr_ttm.c | 155 ++++++++++++++------------ src/mesa/drivers/dri/i915/intel_bufmgr_ttm.h | 17 +++ src/mesa/drivers/dri/i915/intel_ioctl.c | 33 ++++-- src/mesa/drivers/dri/i915/intel_ioctl.h | 4 + src/mesa/drivers/dri/i915/intel_regions.c | 2 +- src/mesa/drivers/dri/i915/intel_screen.c | 2 + 11 files changed, 135 insertions(+), 96 deletions(-) create mode 100644 src/mesa/drivers/dri/i915/intel_bufmgr_ttm.h (limited to 'src/mesa/drivers') diff --git a/src/mesa/drivers/dri/common/dri_bufmgr.c b/src/mesa/drivers/dri/common/dri_bufmgr.c index 7eee0fbf50..91caa8757d 100644 --- a/src/mesa/drivers/dri/common/dri_bufmgr.c +++ b/src/mesa/drivers/dri/common/dri_bufmgr.c @@ -157,9 +157,9 @@ void dri_emit_reloc(dri_bo *batch_buf, GLuint flags, GLuint delta, GLuint offset batch_buf->bufmgr->emit_reloc(batch_buf, flags, delta, offset, relocatee); } -void *dri_process_relocs(dri_bo *batch_buf, GLuint *hack) +void *dri_process_relocs(dri_bo *batch_buf) { - return batch_buf->bufmgr->process_relocs(batch_buf, hack); + return batch_buf->bufmgr->process_relocs(batch_buf); } void dri_post_submit(dri_bo *batch_buf, dri_fence **last_fence) diff --git a/src/mesa/drivers/dri/common/dri_bufmgr.h b/src/mesa/drivers/dri/common/dri_bufmgr.h index f6f283eaa6..46e41f9bec 100644 --- a/src/mesa/drivers/dri/common/dri_bufmgr.h +++ b/src/mesa/drivers/dri/common/dri_bufmgr.h @@ -164,7 +164,7 @@ struct _dri_bufmgr { */ void (*emit_reloc)(dri_bo *batch_buf, GLuint flags, GLuint delta, GLuint offset, dri_bo *relocatee); - void *(*process_relocs)(dri_bo *batch_buf, void *hack); + void *(*process_relocs)(dri_bo *batch_buf); void (*post_submit)(dri_bo *batch_buf, dri_fence **fence); }; @@ -205,7 +205,7 @@ dri_bo *dri_ttm_bo_create_from_handle(dri_bufmgr *bufmgr, const char *name, unsigned int handle); void dri_emit_reloc(dri_bo *batch_buf, GLuint flags, GLuint delta, GLuint offset, dri_bo *relocatee); -void *dri_process_relocs(dri_bo *batch_buf, GLuint *hack); +void *dri_process_relocs(dri_bo *batch_buf); void dri_post_process_relocs(dri_bo *batch_buf); void dri_post_submit(dri_bo *batch_buf, dri_fence **last_fence); #endif diff --git a/src/mesa/drivers/dri/common/dri_bufmgr_fake.c b/src/mesa/drivers/dri/common/dri_bufmgr_fake.c index 21b09b448b..adf0cf5ab7 100644 --- a/src/mesa/drivers/dri/common/dri_bufmgr_fake.c +++ b/src/mesa/drivers/dri/common/dri_bufmgr_fake.c @@ -881,7 +881,7 @@ relocation_sort(const void *a_in, const void *b_in) { } static void * -dri_fake_process_reloc(dri_bo *batch_buf, GLuint *hack) +dri_fake_process_reloc(dri_bo *batch_buf) { dri_bufmgr_fake *bufmgr_fake = (dri_bufmgr_fake *)batch_buf->bufmgr; GLuint i; diff --git a/src/mesa/drivers/dri/i915/intel_batchbuffer.c b/src/mesa/drivers/dri/i915/intel_batchbuffer.c index 46bcb9a941..34c6d6f764 100644 --- a/src/mesa/drivers/dri/i915/intel_batchbuffer.c +++ b/src/mesa/drivers/dri/i915/intel_batchbuffer.c @@ -127,9 +127,8 @@ do_flush_locked(struct intel_batchbuffer *batch, { struct intel_context *intel = batch->intel; void *start; - uint32_t hack; - start = dri_process_relocs(batch->buf, &hack); + start = dri_process_relocs(batch->buf); batch->map = NULL; batch->ptr = NULL; @@ -144,7 +143,7 @@ do_flush_locked(struct intel_batchbuffer *batch, if (intel->intelScreen->ttm == GL_TRUE) { intel_exec_ioctl(batch->intel, used, ignore_cliprects, allow_unlock, - start, &hack); + start, &batch->last_fence); } else { intel_batch_ioctl(batch->intel, batch->buf->offset, diff --git a/src/mesa/drivers/dri/i915/intel_batchbuffer.h b/src/mesa/drivers/dri/i915/intel_batchbuffer.h index b5c7a783a7..b5934e3c9f 100644 --- a/src/mesa/drivers/dri/i915/intel_batchbuffer.h +++ b/src/mesa/drivers/dri/i915/intel_batchbuffer.h @@ -7,7 +7,8 @@ struct intel_context; -#define BATCH_SZ 16384 +//#define BATCH_SZ 16384 +#define BATCH_SZ 4096 #define BATCH_RESERVED 16 #define INTEL_BATCH_NO_CLIPRECTS 0x1 diff --git a/src/mesa/drivers/dri/i915/intel_bufmgr_ttm.c b/src/mesa/drivers/dri/i915/intel_bufmgr_ttm.c index 45a9aa3ed1..0091bb4173 100644 --- a/src/mesa/drivers/dri/i915/intel_bufmgr_ttm.c +++ b/src/mesa/drivers/dri/i915/intel_bufmgr_ttm.c @@ -44,6 +44,8 @@ #include "i915_drm.h" +#include "intel_bufmgr_ttm.h" + #define BUFMGR_DEBUG 0 #define MAX_RELOCS_PER_LIST 511 @@ -128,7 +130,7 @@ typedef struct _dri_fence_ttm } dri_fence_ttm; -static int i830AdjustListNodes(struct intel_bo_list *list) +static int intel_adjust_list_nodes(struct intel_bo_list *list) { struct intel_bo_node *node; drmMMListHead *l; @@ -156,6 +158,7 @@ static int i830AdjustListNodes(struct intel_bo_list *list) return ret; } +#if 0 void intel_bo_free_list(struct intel_bo_list *list) { struct intel_bo_node *node; @@ -180,13 +183,14 @@ void intel_bo_free_list(struct intel_bo_list *list) list->numCurrent--; } } - -int intel_bo_reset_list(struct intel_bo_list *list) +#endif + +static int intel_bo_reset_list(struct intel_bo_list *list) { drmMMListHead *l; int ret; - ret = i830AdjustListNodes(list); + ret = intel_adjust_list_nodes(list); if (ret) return ret; @@ -197,7 +201,7 @@ int intel_bo_reset_list(struct intel_bo_list *list) list->numOnList--; l = list->list.next; } - return i830AdjustListNodes(list); + return intel_adjust_list_nodes(list); } static void generic_destroy(void *nodep) @@ -205,7 +209,7 @@ static void generic_destroy(void *nodep) free(nodep); } -int intel_create_bo_list(int numTarget, struct intel_bo_list *list, void (*destroy)(void *)) +static int intel_create_bo_list(int numTarget, struct intel_bo_list *list, void (*destroy)(void *)) { DRMINITLISTHEAD(&list->list); DRMINITLISTHEAD(&list->free); @@ -216,11 +220,11 @@ int intel_create_bo_list(int numTarget, struct intel_bo_list *list, void (*destr list->destroy = destroy; else list->destroy = generic_destroy; - return i830AdjustListNodes(list); + return intel_adjust_list_nodes(list); } -struct drm_i915_op_arg * +static struct drm_i915_op_arg * intel_setup_validate_list(int fd, struct intel_bo_list *list, struct intel_bo_list *reloc_list) { struct intel_bo_node *node; @@ -259,7 +263,6 @@ intel_setup_validate_list(int fd, struct intel_bo_list *list, struct intel_bo_li if (rl_node->handle == node->buf->handle) { arg->reloc_handle = rl_node->type_list.buf.handle; - // drmBOUnmap(fd, &rl_node->type_list.buf); } } } @@ -270,7 +273,7 @@ intel_setup_validate_list(int fd, struct intel_bo_list *list, struct intel_bo_li return first; } -void intel_free_validate_list(int fd, struct intel_bo_list *list) +static void intel_free_validate_list(int fd, struct intel_bo_list *list) { struct intel_bo_node *node; drmMMListHead *l; @@ -284,29 +287,29 @@ void intel_free_validate_list(int fd, struct intel_bo_list *list) } } -void intel_free_reloc_list(int fd, struct intel_bo_list *reloc_list) +static void intel_free_reloc_list(int fd, struct intel_bo_list *reloc_list) { struct intel_bo_reloc_node *reloc_node; drmMMListHead *rl, *tmp; for (rl = reloc_list->list.next, tmp = rl->next; rl != &reloc_list->list; rl = tmp, tmp = rl->next) { reloc_node = DRMLISTENTRY(struct intel_bo_reloc_node, rl, head); - + DRMLISTDEL(rl); if (reloc_node->nr_reloc_types > 1) { /* TODO */ } - + drmBOUnmap(fd, &reloc_node->type_list.buf); drmBODestroy(fd, &reloc_node->type_list.buf); free(reloc_node); } } -int intel_add_validate_buffer(struct intel_bo_list *list, dri_bo *buf, unsigned flags, - unsigned mask, int *itemLoc, void (*destroy_cb)(void *)) +static int intel_add_validate_buffer(struct intel_bo_list *list, dri_bo *buf, unsigned flags, + unsigned mask, int *itemLoc, void (*destroy_cb)(void *)) { struct intel_bo_node *node, *cur; drmMMListHead *l; @@ -317,7 +320,7 @@ int intel_add_validate_buffer(struct intel_bo_list *list, dri_bo *buf, unsigned for (l = list->list.next; l != &list->list; l = l->next) { node = DRMLISTENTRY(struct intel_bo_node, l, head); - if (node->buf == buf_bo) { + if (node->buf->handle == buf_bo->handle) { cur = node; break; } @@ -343,25 +346,9 @@ int intel_add_validate_buffer(struct intel_bo_list *list, dri_bo *buf, unsigned unsigned memFlags = cur->arg0 & flags & memMask; if (!memFlags) { -#if 0 - ErrorF("Incompatible memory location requests " - "on validate list.\n"); - ErrorF("Previous flag: 0x%08lx, mask: 0x%08lx\n", - cur->arg0, cur->arg1); - ErrorF("Current flag: 0x%08lx, mask: 0x%08lx\n", - flags, mask); -#endif return -EINVAL; } if (mask & cur->arg1 & ~DRM_BO_MASK_MEM & (cur->arg0 ^ flags)) { -#if 0 - ErrorF("Incompatible buffer flag requests " - "on validate list.\n"); - ErrorF("Previous flag: 0x%08lx, mask: 0x%08lx\n", - cur->arg0, cur->arg1); - ErrorF("Current flag: 0x%08lx, mask: 0x%08lx\n", - flags, mask); -#endif return -EINVAL; } cur->arg1 |= mask; @@ -395,7 +382,7 @@ static int intel_create_new_reloc_type_list(int fd, struct intel_bo_reloc_list * } -int intel_add_validate_reloc(int fd, struct intel_bo_list *reloc_list, struct intel_reloc_info *reloc_info) +static int intel_add_validate_reloc(int fd, struct intel_bo_list *reloc_list, struct intel_reloc_info *reloc_info) { struct intel_bo_reloc_node *rl_node, *cur; drmMMListHead *rl, *l; @@ -411,7 +398,6 @@ int intel_add_validate_reloc(int fd, struct intel_bo_list *reloc_list, struct in if (rl_node->handle == reloc_info->handle) { cur = rl_node; break; - } } @@ -594,7 +580,7 @@ intel_ttm_bo_create_from_handle(dri_bufmgr *bufmgr, const char *name, ttm_buf->owner = GL_FALSE; #if BUFMGR_DEBUG - fprintf(stderr, "bo_create_from_handle: %p (%s)\n", &ttm_buf->bo, + fprintf(stderr, "bo_create_from_handle: %p %08x (%s)\n", &ttm_buf->bo, handle, ttm_buf->name); #endif @@ -731,39 +717,48 @@ dri_ttm_validate(dri_bo *buf, unsigned int flags) return err; } -static dri_fence * -dri_ttm_fence_validated(dri_bufmgr *bufmgr, const char *name, - GLboolean flushed) +/* Returns a dri_bo wrapping the given buffer object handle. + * + * This can be used when one application needs to pass a buffer object + * to another. + */ +dri_fence * +intel_ttm_fence_create_from_arg(dri_bufmgr *bufmgr, const char *name, + drm_fence_arg_t *arg) { - dri_fence_ttm *fence_ttm = malloc(sizeof(*fence_ttm)); - dri_bufmgr_ttm *bufmgr_ttm = (dri_bufmgr_ttm *)bufmgr; - int ret; - unsigned int type; + dri_bufmgr_ttm *ttm_bufmgr; + dri_fence_ttm *ttm_fence; - if (!fence_ttm) - return NULL; + ttm_bufmgr = (dri_bufmgr_ttm *)bufmgr; - if (flushed) - type = bufmgr_ttm->fence_type_flush; - else - type = bufmgr_ttm->fence_type; - - fence_ttm->refcount = 1; - fence_ttm->name = name; - fence_ttm->fence.bufmgr = bufmgr; - ret = drmFenceBuffers(bufmgr_ttm->fd, type, 0, &fence_ttm->drm_fence); - if (ret) { - fprintf(stderr, "failed to fence (%s): %s\n", name, strerror(-ret)); - free(fence_ttm); + ttm_fence = malloc(sizeof(*ttm_fence)); + if (!ttm_fence) return NULL; - } + + ttm_fence->drm_fence.handle = arg->handle; + ttm_fence->drm_fence.fence_class = arg->fence_class; + ttm_fence->drm_fence.type = arg->type; + ttm_fence->drm_fence.flags = arg->flags; + ttm_fence->drm_fence.signaled = 0; + ttm_fence->drm_fence.sequence = arg->sequence; + + ttm_fence->fence.bufmgr = bufmgr; + ttm_fence->name = name; + ttm_fence->refcount = 1; #if BUFMGR_DEBUG - fprintf(stderr, "fence_validated: %p (%s)\n", &fence_ttm->fence, - fence_ttm->name); + fprintf(stderr, "fence_create_from_handle: %p (%s)\n", &ttm_fence->fence, + ttm_fence->name); #endif - return &fence_ttm->fence; + return &ttm_fence->fence; +} + +static dri_fence * +dri_ttm_fence_validated(dri_bufmgr *bufmgr, const char *name, + GLboolean flushed) +{ + return NULL; } static void @@ -775,6 +770,10 @@ dri_ttm_fence_reference(dri_fence *fence) _glthread_LOCK_MUTEX(bufmgr_ttm->mutex); ++fence_ttm->refcount; _glthread_UNLOCK_MUTEX(bufmgr_ttm->mutex); +#if BUFMGR_DEBUG + fprintf(stderr, "fence_reference: %p (%s)\n", &fence_ttm->fence, + fence_ttm->name); +#endif } static void @@ -786,6 +785,10 @@ dri_ttm_fence_unreference(dri_fence *fence) if (!fence) return; +#if BUFMGR_DEBUG + fprintf(stderr, "fence_unreference: %p (%s)\n", &fence_ttm->fence, + fence_ttm->name); +#endif _glthread_LOCK_MUTEX(bufmgr_ttm->mutex); if (--fence_ttm->refcount == 0) { int ret; @@ -845,7 +848,7 @@ static void intel_dribo_destroy_callback(void *priv) dri_bo *dribo = priv; if (dribo) { - dri_bo_unreference(dribo); + dri_bo_unreference(dribo); } } @@ -854,12 +857,22 @@ dri_ttm_emit_reloc(dri_bo *batch_buf, GLuint flags, GLuint delta, GLuint offset, dri_bo *relocatee) { dri_bo_ttm *ttm_buf = (dri_bo_ttm *)batch_buf; - dri_bo_ttm *relocatee_buf = (dri_bo_ttm *)relocatee; dri_bufmgr_ttm *bufmgr_ttm = (dri_bufmgr_ttm *)batch_buf->bufmgr; int newItem; struct intel_reloc_info reloc; + int mask; + int ret; + + mask = DRM_BO_MASK_MEM; + mask |= flags & (DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE | DRM_BO_FLAG_EXE); + + ret = intel_add_validate_buffer(&bufmgr_ttm->list, relocatee, flags, mask, &newItem, intel_dribo_destroy_callback); + if (ret < 0) + return; - intel_add_validate_buffer(&bufmgr_ttm->list, relocatee, flags, flags, &newItem, intel_dribo_destroy_callback); + if (ret == 1) { + dri_bo_reference(relocatee); + } reloc.type = I915_RELOC_TYPE_0; reloc.reloc = offset; @@ -873,18 +886,19 @@ dri_ttm_emit_reloc(dri_bo *batch_buf, GLuint flags, GLuint delta, GLuint offset, static void * -dri_ttm_process_reloc(dri_bo *batch_buf, GLuint *hack) +dri_ttm_process_reloc(dri_bo *batch_buf) { dri_bufmgr_ttm *bufmgr_ttm = (dri_bufmgr_ttm *)batch_buf->bufmgr; void *ptr; int itemLoc; + dri_bo_unmap(batch_buf); + intel_add_validate_buffer(&bufmgr_ttm->list, batch_buf, DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_EXE, DRM_BO_MASK_MEM | DRM_BO_FLAG_EXE, &itemLoc, NULL); ptr = intel_setup_validate_list(bufmgr_ttm->fd, &bufmgr_ttm->list, &bufmgr_ttm->reloc_list); - *hack = ((dri_bo_ttm *)batch_buf)->drm_bo.handle; return ptr; } @@ -896,14 +910,7 @@ dri_ttm_post_submit(dri_bo *batch_buf, dri_fence **last_fence) intel_free_validate_list(bufmgr_ttm->fd, &bufmgr_ttm->list); intel_free_reloc_list(bufmgr_ttm->fd, &bufmgr_ttm->reloc_list); - /* - - bb->fence.handle = execbuf.fence_arg.handle; - bb->fence.fence_class = execbuf.fence_arg.fence_class; - bb->fence.type = execbuf.fence_arg.type; - bb->fence.flags = execbuf.fence_arg.flags; - bb->fence.signaled = 0; - */ + intel_bo_reset_list(&bufmgr_ttm->list); } /** @@ -927,7 +934,7 @@ intel_bufmgr_ttm_init(int fd, unsigned int fence_type, bufmgr_ttm->fence_type_flush = fence_type_flush; _glthread_INIT_MUTEX(bufmgr_ttm->mutex); - intel_create_bo_list(40, &bufmgr_ttm->list, NULL); + intel_create_bo_list(10, &bufmgr_ttm->list, NULL); intel_create_bo_list(1, &bufmgr_ttm->reloc_list, NULL); bufmgr_ttm->bufmgr.bo_alloc = dri_ttm_alloc; diff --git a/src/mesa/drivers/dri/i915/intel_bufmgr_ttm.h b/src/mesa/drivers/dri/i915/intel_bufmgr_ttm.h new file mode 100644 index 0000000000..642fe358f6 --- /dev/null +++ b/src/mesa/drivers/dri/i915/intel_bufmgr_ttm.h @@ -0,0 +1,17 @@ + +#ifndef INTEL_BUFMGR_TTM_H +#define INTEL_BUFMGR_TTM_H + +#include "dri_bufmgr.h" + +extern dri_bo *intel_ttm_bo_create_from_handle(dri_bufmgr *bufmgr, const char *name, + unsigned int handle); + +dri_fence *intel_ttm_fence_create_from_arg(dri_bufmgr *bufmgr, const char *name, + drm_fence_arg_t *arg); + + +dri_bufmgr *intel_bufmgr_ttm_init(int fd, unsigned int fence_type, + unsigned int fence_type_flush); + +#endif diff --git a/src/mesa/drivers/dri/i915/intel_ioctl.c b/src/mesa/drivers/dri/i915/intel_ioctl.c index a93530c7b1..873e8b9788 100644 --- a/src/mesa/drivers/dri/i915/intel_ioctl.c +++ b/src/mesa/drivers/dri/i915/intel_ioctl.c @@ -42,6 +42,8 @@ #include "intel_regions.h" #include "drm.h" +#include "intel_bufmgr_ttm.h" + #define FILE_DEBUG_FLAG DEBUG_IOCTL int @@ -135,16 +137,20 @@ void intel_exec_ioctl(struct intel_context *intel, GLuint used, GLboolean ignore_cliprects, GLboolean allow_unlock, - void *start, uint32_t *hack) + void *start, dri_fence **fence) { struct drm_i915_execbuffer execbuf; - + dri_fence *fo; + assert(intel->locked); assert(used); + if (*fence) { + dri_fence_unreference(*fence); + } + memset(&execbuf, 0, sizeof(execbuf)); - execbuf.cmdbuf_handle = *hack; // TODO execbuf.batch.used = used; execbuf.batch.cliprects = intel->pClipRects; execbuf.batch.num_cliprects = ignore_cliprects ? 0 : intel->numClipRects; @@ -153,25 +159,28 @@ intel_exec_ioctl(struct intel_context *intel, (((GLuint) intel->drawY) << 16)); execbuf.ops_list = (unsigned)start; // TODO - execbuf.fence_arg.flags = DRM_I915_FENCE_FLAG_FLUSHED; + execbuf.fence_arg.flags = DRM_FENCE_FLAG_SHAREABLE | DRM_I915_FENCE_FLAG_FLUSHED; - if (drmCommandWrite(intel->driFd, DRM_I915_EXECBUFFER, &execbuf, + if (drmCommandWriteRead(intel->driFd, DRM_I915_EXECBUFFER, &execbuf, sizeof(execbuf))) { fprintf(stderr, "DRM_I830_EXECBUFFER: %d\n", -errno); UNLOCK_HARDWARE(intel); exit(1); } + + fo = intel_ttm_fence_create_from_arg(intel->intelScreen->bufmgr, "fence buffers", + &execbuf.fence_arg); + if (!fo) { + fprintf(stderr, "failed to fence handle: %08x\n", execbuf.fence_arg.handle); + UNLOCK_HARDWARE(intel); + exit(1); + } + *fence = fo; + /* FIXME: use hardware contexts to avoid 'losing' hardware after * each buffer flush. */ intel->vtbl.lost_hardware(intel); -#if 0 - fence->handle = execbuf.fence_arg.handle; - fence->fence_class = execbuf.fence_arg.fence_class; - fence->type = execbuf.fence_arg.type; - fence->flags = execbuf.fence_arg.flags; - fence->fence.signaled = 0; -#endif } diff --git a/src/mesa/drivers/dri/i915/intel_ioctl.h b/src/mesa/drivers/dri/i915/intel_ioctl.h index 7a5b175ed1..689f21cae8 100644 --- a/src/mesa/drivers/dri/i915/intel_ioctl.h +++ b/src/mesa/drivers/dri/i915/intel_ioctl.h @@ -37,4 +37,8 @@ void intel_batch_ioctl(struct intel_context *intel, GLuint start_offset, GLuint used, GLboolean ignore_cliprects, GLboolean allow_unlock); +void intel_exec_ioctl(struct intel_context *intel, + GLuint used, + GLboolean ignore_cliprects, GLboolean allow_unlock, + void *start, dri_fence **fence); #endif diff --git a/src/mesa/drivers/dri/i915/intel_regions.c b/src/mesa/drivers/dri/i915/intel_regions.c index d2441970b3..187ccf1776 100644 --- a/src/mesa/drivers/dri/i915/intel_regions.c +++ b/src/mesa/drivers/dri/i915/intel_regions.c @@ -162,7 +162,7 @@ intel_region_create_static(intelScreenPrivate *intelScreen, if (intelScreen->ttm) { assert(bo_handle != -1); - region->buffer = dri_ttm_bo_create_from_handle(intelScreen->bufmgr, + region->buffer = intel_ttm_bo_create_from_handle(intelScreen->bufmgr, "static region", bo_handle); } else { diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c index 0b889b1aa0..084de1004b 100644 --- a/src/mesa/drivers/dri/i915/intel_screen.c +++ b/src/mesa/drivers/dri/i915/intel_screen.c @@ -50,6 +50,8 @@ #include "intel_regions.h" #include "intel_batchbuffer.h" +#include "intel_bufmgr_ttm.h" + PUBLIC const char __driConfigOptions[] = DRI_CONF_BEGIN DRI_CONF_SECTION_PERFORMANCE DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS) -- cgit v1.2.3