diff options
author | Dale Stimson <dale.b.stimson@intel.com> | 2014-12-04 20:47:28 -0800 |
---|---|---|
committer | Patrick Tjin <pattjin@google.com> | 2014-12-07 21:00:43 -0800 |
commit | 995a232f386fd24eed9d2c222128339588b33207 (patch) | |
tree | e0178721b460b218cff0972f7d749e426c012116 | |
parent | ba8f7342feb749eeeca3423cb231110b00124ac5 (diff) | |
download | libwsbm-995a232f386fd24eed9d2c222128339588b33207.tar.gz |
Revert "ION support in libwsbm."android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-release
Remove ION memory manager due to regressions caused by its inclusion.
This reverts commit ba8f7342feb749eeeca3423cb231110b00124ac5.
Bug: 18578655
Bug: 18527174
BZ: 230087
BZ: 229790
BZ: 229995
Change-Id: I013c959628736f6dace974746fa8af4e54691c90
Signed-off-by: Dale Stimson <dale.b.stimson@intel.com>
-rw-r--r-- | src/wsbm_manager.c | 8 | ||||
-rw-r--r-- | src/wsbm_manager.h | 2 | ||||
-rw-r--r-- | src/wsbm_ttmpool.c | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/wsbm_manager.c b/src/wsbm_manager.c index 0cbf9de..e7c8f5d 100644 --- a/src/wsbm_manager.c +++ b/src/wsbm_manager.c @@ -613,7 +613,7 @@ wsbmBOData(struct _WsbmBufferObject *buf, int wsbmBODataUB(struct _WsbmBufferObject *buf, unsigned size, const void *data, struct _WsbmBufferPool *newPool, - uint32_t placement, const unsigned long *user_ptr, int fd) + uint32_t placement, const unsigned long *user_ptr) { int newBuffer; int retval = 0; @@ -624,7 +624,7 @@ wsbmBODataUB(struct _WsbmBufferObject *buf, extern struct _WsbmBufStorage * ttm_pool_ub_create(struct _WsbmBufferPool *pool, unsigned long size, uint32_t placement, unsigned alignment, - const unsigned long *user_ptr, int fd); + const unsigned long *user_ptr); if (buf->bufferType == WSBM_BUFFER_SIMPLE) return -EINVAL; @@ -659,7 +659,7 @@ wsbmBODataUB(struct _WsbmBufferObject *buf, } buf->storage = - ttm_pool_ub_create(newPool, size, placement, buf->alignment, user_ptr, fd); + ttm_pool_ub_create(newPool, size, placement, buf->alignment, user_ptr); if (!buf->storage) { retval = -ENOMEM; goto out; @@ -681,7 +681,7 @@ wsbmBODataUB(struct _WsbmBufferObject *buf, curPool = storage->pool; tmp_storage = - ttm_pool_ub_create(curPool, size, placement, buf->alignment, user_ptr, fd); + ttm_pool_ub_create(curPool, size, placement, buf->alignment, user_ptr); if (tmp_storage) { wsbmBufStorageUnref(&buf->storage); diff --git a/src/wsbm_manager.h b/src/wsbm_manager.h index 1fd5e39..aa2eb5f 100644 --- a/src/wsbm_manager.h +++ b/src/wsbm_manager.h @@ -95,7 +95,7 @@ extern int wsbmBOData(struct _WsbmBufferObject *r_buf, extern int wsbmBODataUB(struct _WsbmBufferObject *buf, unsigned size, const void *data, struct _WsbmBufferPool *newPool, - uint32_t placement, const unsigned long *user_ptr, int fd); + uint32_t placement, const unsigned long *user_ptr); extern int wsbmBOSetStatus(struct _WsbmBufferObject *buf, uint32_t setPlacement, uint32_t clrPlacement); diff --git a/src/wsbm_ttmpool.c b/src/wsbm_ttmpool.c index 3b594b3..0ea32bd 100644 --- a/src/wsbm_ttmpool.c +++ b/src/wsbm_ttmpool.c @@ -529,7 +529,7 @@ wsbmTTMPoolInit(int fd, unsigned int devOffset) } struct _WsbmBufStorage * -ttm_pool_ub_create(struct _WsbmBufferPool *pool, unsigned long size, uint32_t placement, unsigned alignment, const unsigned long *user_ptr, int fd) +ttm_pool_ub_create(struct _WsbmBufferPool *pool, unsigned long size, uint32_t placement, unsigned alignment, const unsigned long *user_ptr) { struct _TTMBuffer *dBuf = (struct _TTMBuffer *) calloc(1, sizeof(*dBuf)); @@ -556,7 +556,6 @@ ttm_pool_ub_create(struct _WsbmBufferPool *pool, unsigned long size, uint32_t pl arg.req.placement = placement; arg.req.page_alignment = alignment / pageSize; arg.req.user_address = (unsigned long)user_ptr; - arg.req.fd = fd; DRMRESTARTCOMMANDWRITEREAD(pool->fd, ttmPool->devOffset + TTM_PL_CREATE_UB, arg, ret); |